Browse Source

avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size check

Fixes Ticket4778

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.4.11
Michael Niedermayer 10 years ago
parent
commit
5b41bb29d7
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/h264_mp4toannexb_bsf.c

+ 1
- 1
libavcodec/h264_mp4toannexb_bsf.c View File

@@ -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 (unit_type == 7 || unit_type == 8)


Loading…
Cancel
Save