Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c': h264: check buffer size before accessing it Conflicts: libavcodec/h264.c See: ea0ac11e52 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · fe540ae6b7
parent 7a88b7a9ad f0259a587e
commit fe540ae6b7
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@ -4755,7 +4755,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
                h->workaround_bugs |= FF_BUG_TRUNCATED;

            if (!(h->workaround_bugs & FF_BUG_TRUNCATED))
-                while(dst_length > 0 && ptr[dst_length - 1] == 0)
+                while (dst_length > 0 && ptr[dst_length - 1] == 0)
                    dst_length--;
            bit_length = !dst_length ? 0
                                     : (8 * dst_length -