avcodec/mjpeg_parser: Adjust size rejection threshold

michaelni · michaelni · commit 3c4679c4302d · 2020-07-11T00:25:33.000+02:00
Fixes: 86987846-429c8d80-c197-11ea-916b-bb4738e09687.jpg Fixes: Regression since ec3d8a0 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit dde6077) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
diff --git a/libavcodec/mjpeg_parser.c b/libavcodec/mjpeg_parser.c
@@ -82,7 +82,7 @@ static int find_frame_end(MJPEGParserContext *m, const uint8_t *buf, int buf_siz
                     return i-3;
                 } else if(state<0xFFD00000 || state>0xFFD9FFFF){
                     m->size= (state&0xFFFF)-1;
-                    if (m->size >= 0x8000)
+                    if (m->size >= 0xF000)
                         m->size = 0;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ static int find_frame_end(MJPEGParserContext m, const uint8_t buf, int buf_siz`
`82`	`82`	`return i-3;`
`83`	`83`	`} else if(state<0xFFD00000 \|\| state>0xFFD9FFFF){`
`84`	`84`	`m->size= (state&0xFFFF)-1;`
`85`		`- if (m->size >= 0x8000)`
	`85`	`+ if (m->size >= 0xF000)`
`86`	`86`	`m->size = 0;`
`87`	`87`	`}`
`88`	`88`	`}`