diff mbox series

[FFmpeg-devel] avcodec/mjpeg_parser: Adjust size rejection threshold

Message ID 20200709225549.14033-1-michael@niedermayer.cc
State Accepted
Commit dde60772970ed663b85d475e741013a0222decda
Headers show
Series [FFmpeg-devel] avcodec/mjpeg_parser: Adjust size rejection threshold | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer July 9, 2020, 10:55 p.m. UTC 
Fixes: 86987846-429c8d80-c197-11ea-916b-bb4738e09687.jpg
Fixes: Regression since ec3d8a0e6945fe015d16cd98a1e7dbb4be815c15

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/mjpeg_parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer July 10, 2020, 6:22 p.m. UTC | #1 
On Fri, Jul 10, 2020 at 12:55:49AM +0200, Michael Niedermayer wrote:
> Fixes: 86987846-429c8d80-c197-11ea-916b-bb4738e09687.jpg
> Fixes: Regression since ec3d8a0e6945fe015d16cd98a1e7dbb4be815c15
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mjpeg_parser.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply and backport

[...]
diff mbox series

Patch

diff --git a/libavcodec/mjpeg_parser.c b/libavcodec/mjpeg_parser.c
index c642b2ecbc..f54fdd37cb 100644
--- 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;
                 }
             }