diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 11:55:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 11:56:46 +0100 |
| commit | fe540ae6b72a20e84f828b2e37a0a538631b4049 (patch) | |
| tree | e8e65bb784d9472beb2fc0678e055d260afd7727 /libavcodec/h264.c | |
| parent | 7a88b7a9ad7ab5c9bd4b71db6790c59aa1155582 (diff) | |
| parent | f0259a587ee3419dd894873ea617b4c98eeaca1c (diff) | |
| download | ffmpeg-fe540ae6b72a20e84f828b2e37a0a538631b4049.tar.gz | |
Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'
* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c':
h264: check buffer size before accessing it
Conflicts:
libavcodec/h264.c
See: ea0ac11e52b9cf5264f3d4eb7543e760c2a5fbb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 9110746d3f..4cf7726b40 100644 --- 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 - |