[FFmpeg-cvslog] avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size check
Michael Niedermayer
git at videolan.org
Sat Oct 10 00:38:43 CEST 2015
ffmpeg | branch: release/2.2 | Michael Niedermayer <michael at niedermayer.cc> | Fri Aug 21 02:49:21 2015 +0200| [3ae3708246ec9ca46580b8ea40fd01bca31c97b3] | committer: Carl Eugen Hoyos
avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size check
Fixes Ticket4778
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 2bb54b82b5094fd906aa28c0443be08c95662a31)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ae3708246ec9ca46580b8ea40fd01bca31c97b3
---
libavcodec/h264_mp4toannexb_bsf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c
index a003a1d..91605ff 100644
--- a/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@ -173,7 +173,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
buf += ctx->length_size;
unit_type = *buf & 0x1f;
- if (buf + nal_size > buf_end || nal_size < 0)
+ if (nal_size > buf_end - buf || nal_size < 0)
goto fail;
if (ctx->first_idr && (unit_type == 7 || unit_type == 8))
More information about the ffmpeg-cvslog
mailing list