Commit 8b031359 authored by Loren Merritt's avatar Loren Merritt

fix some crashes on negative nalsize.

Originally committed as revision 5022 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 214c5f26
...@@ -7507,6 +7507,15 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ ...@@ -7507,6 +7507,15 @@ 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){
if(nalsize == 1){
buf_index++;
continue;
}else{
av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
break;
}
}
} else { } else {
// start code prefix search // start code prefix search
for(; buf_index + 3 < buf_size; buf_index++){ for(; buf_index + 3 < buf_size; buf_index++){
......
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