diff options
| author | Mean <fixounet@free.fr> | 2007-04-29 23:18:39 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2007-04-29 23:18:39 +0000 |
| commit | dcc3a30b58c51babcba85905a9617c64090c95ab (patch) | |
| tree | fac033905aff222ca3fd66aff6b639fb1b7f4ee2 /libavcodec/h264.c | |
| parent | 428098165de4c3edfe42c1b7f00627d287015863 (diff) | |
prevent going out of the buffer if the nal size does not fit in the buffer.
Patch by Mean % fixounet A free P fr %
Original thread:
Date: Apr 29, 2007 2:00 PM
Subject: Re: [Ffmpeg-devel] [patch] h264.c, dont go beyond buffer in h264_decode_nal_unit
Originally committed as revision 8858 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 b5bd0a8a71..40dbb96c90 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -8122,7 +8122,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ nalsize = 0; for(i = 0; i < h->nal_length_size; i++) nalsize = (nalsize << 8) | buf[buf_index++]; - if(nalsize <= 1 || nalsize > buf_size){ + if(nalsize <= 1 || (nalsize+buf_index > buf_size)){ if(nalsize == 1){ buf_index++; continue; |