Commit dcc3a30b authored by Mean's avatar Mean Committed by Guillaume Poirier

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
parent 42809816
...@@ -8122,7 +8122,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ ...@@ -8122,7 +8122,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
nalsize = 0; nalsize = 0;
for(i = 0; i < h->nal_length_size; i++) for(i = 0; i < h->nal_length_size; i++)
nalsize = (nalsize << 8) | buf[buf_index++]; nalsize = (nalsize << 8) | buf[buf_index++];
if(nalsize <= 1 || nalsize > buf_size){ if(nalsize <= 1 || (nalsize+buf_index > buf_size)){
if(nalsize == 1){ if(nalsize == 1){
buf_index++; buf_index++;
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment