generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size check

Browse Source 
Fixes Ticket4778

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2bb54b82b5)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-08-21 02:49:21 +02:00
parent 1c058d94b9
commit 5b41bb29d7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_mp4toannexb_bsf.c
View File

@@ -173,7 +173,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
buf += ctx->length_size; buf += ctx->length_size;
unit_type = *buf & 0x1f; unit_type = *buf & 0x1f;
if (buf + nal_size > buf_end || nal_size < 0) if (nal_size > buf_end - buf || nal_size < 0)
goto fail; goto fail;
if (unit_type == 7 || unit_type == 8) if (unit_type == 7 || unit_type == 8)