diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-21 14:34:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-21 14:34:02 +0200 |
| commit | c9f17afe4e3c1fb57d089a8de5237851b0c0122b (patch) | |
| tree | 98238e7d9e87655a1c8ac8f7f4105a4430f8b667 | |
| parent | 6d33c8ec84904933878e341a8a4a30d3b944458f (diff) | |
| parent | af40847681b978441fdd25276685414f9e17820a (diff) | |
Merge commit 'af40847681b978441fdd25276685414f9e17820a' into release/1.1
* commit 'af40847681b978441fdd25276685414f9e17820a':
h264: check buffer size before accessing it
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <[email protected]>
| -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 fbbd4fc18c..7268c3b5cb 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4042,7 +4042,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, s->workaround_bugs |= FF_BUG_TRUNCATED; if (!(s->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 - |