virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

avcodec/mjpeg_parser: Make parser a bit more robust with unclean input

Browse Source 
Helps: test_roman.mjpeg (note this is not really just mjpeg)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-10-10 22:23:41 +02:00
parent 27522fb64c
commit ec3d8a0e69
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mjpeg_parser.c
View File

@ -50,7 +50,7 @@ static int find_frame_end(MJPEGParserContext *m, const uint8_t *buf, int buf_siz
for(i=0; i<buf_size;){ for(i=0; i<buf_size;){
state= (state<<8) | buf[i]; state= (state<<8) | buf[i];
if(state>=0xFFC00000 && state<=0xFFFEFFFF){ if(state>=0xFFC00000 && state<=0xFFFEFFFF){
if(state>=0xFFD80000 && state<=0xFFD8FFFF){ if(state>=0xFFD8FFC0 && state<=0xFFD8FFFF){
i++; i++;
vop_found=1; vop_found=1;
break; break;
@ -76,12 +76,14 @@ static int find_frame_end(MJPEGParserContext *m, const uint8_t *buf, int buf_siz
for(; i<buf_size;){ for(; i<buf_size;){
state= (state<<8) | buf[i]; state= (state<<8) | buf[i];
if(state>=0xFFC00000 && state<=0xFFFEFFFF){ if(state>=0xFFC00000 && state<=0xFFFEFFFF){
if(state>=0xFFD80000 && state<=0xFFD8FFFF){ if(state>=0xFFD8FFC0 && state<=0xFFD8FFFF){
pc->frame_start_found=0; pc->frame_start_found=0;
pc->state=0; pc->state=0;
return i-3; return i-3;
} else if(state<0xFFD00000 || state>0xFFD9FFFF){ } else if(state<0xFFD00000 || state>0xFFD9FFFF){
m->size= (state&0xFFFF)-1; m->size= (state&0xFFFF)-1;
if (m->size >= 0x8000)
m->size = 0;
} }
} }
if(m->size>0){ if(m->size>0){