diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:28:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:28:35 +0200 |
| commit | 20bd9210821cfbe1a119b71e103510c6714bf86a (patch) | |
| tree | 6e7c8381812c554bd4ed85b7b77a5871fcc1ba59 /libavcodec/h264.c | |
| parent | 853a93804d16c79028ba8005d4c033a403fc34f9 (diff) | |
| parent | 1a8c6917f68f7378465e18f7615762bfd22704c2 (diff) | |
| download | ffmpeg-20bd9210821cfbe1a119b71e103510c6714bf86a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: avoid stuck buffer pointer in decode_nal_units
mpeg12: fix the semantics of the int* parameter of decode()
Conflicts:
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 713fda7421..fe3bac0eae 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3783,8 +3783,10 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) buf[buf_index + 2] == 1) break; - if (buf_index + 3 >= buf_size) + if (buf_index + 3 >= buf_size) { + buf_index = buf_size; break; + } buf_index += 3; if (buf_index >= next_avc) |