Browse Source

h264: check for out of bounds reads in ff_h264_decode_extradata().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n0.9
Laurent Aimar Anton Khirnov 14 years ago
parent
commit
d1186ff72d
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/h264.c

+ 4
- 0
libavcodec/h264.c View File

@@ -1005,6 +1005,8 @@ int ff_h264_decode_extradata(H264Context *h)
p += 6;
for (i = 0; i < cnt; i++) {
nalsize = AV_RB16(p) + 2;
if (p - avctx->extradata + nalsize > avctx->extradata_size)
return -1;
if(decode_nal_units(h, p, nalsize) < 0) {
av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i);
return -1;
@@ -1015,6 +1017,8 @@ int ff_h264_decode_extradata(H264Context *h)
cnt = *(p++); // Number of pps
for (i = 0; i < cnt; i++) {
nalsize = AV_RB16(p) + 2;
if (p - avctx->extradata + nalsize > avctx->extradata_size)
return -1;
if (decode_nal_units(h, p, nalsize) < 0) {
av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
return -1;


Loading…
Cancel
Save