From patchwork Fri Mar 11 20:20:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp94027nkb; Fri, 11 Mar 2022 12:21:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPRCH8xOTrRx/xOIZmyw0wTivSiVMCJ0kKVOgSrMgdaPlGa9FgtyyLEeitjU1JdfWrnXMH X-Received: by 2002:a17:906:4796:b0:6d6:dd04:147b with SMTP id cw22-20020a170906479600b006d6dd04147bmr10278720ejc.80.1647030069314; Fri, 11 Mar 2022 12:21:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647030069; cv=none; d=google.com; s=arc-20160816; b=xeOvDQ6O6588CBV+y3cPOk5xDHONXFn/PgH0CXA/GHVamrIEt+mnkSQA1w+tZ6+8Z4 B4kMA8rkjGOBzK2TXKqoIZVYoXA1YZ8clD62AdACKHNn1qQopPI0WhXR4PJ12wgjJL3c a5H3MlkMH1191jCtkVjTRF3w9Fa9tFAQWcMnEzgEY3fD0AJpdd8v9HQCor1Erv1/6wCm i5+cD8lRsMl5s8YtpRm4cD5RNPeLRAfHl+h765QptV0nGPHwkKoezG5XmFF5199jLuc1 Gg/cTEAmDtLOT2WpPcaS7nP5bg+pXPQpQTsUSSNd6pr4AWAOQBhKR6GqRN5vyNIsjLrl lIGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=ieT1ZhcnxjOUtx23TTXzHQtuh4U4SbP5dPaZdLvpceY=; b=0mvIEKqjazuj/i34zU1TGgAqHz5bTeNNQZTqyVB+H9n986yDySw/X28vw4yWciTHSI yz+J9Vu00JF8lFZKOj6XdwQhGTDuU8PX4j8SyPZ4hxlFu4GEykVSX/keLX4u7AbmLIhs 9DGY0+x7u+yDy6f8ZYL8NTZrQrMfhKgVa5K4fSJlsHrMJXwJ+f/EjJ/ZeLbFX0IK9hqc 4nvqimL8eKVrVKJZpWZnBlCEJme39YN2xfbigaoPXTThnk2IKVitAPHeiXU4q61I0nQe +oZ0ZKM6s4VGPf7UFPL4M3Z0hA3n8+KO1RG3s0/QauWOBTwsuNGLP1Ihyz6OxIQhYVfi 1oZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a5-20020a170906274500b006d1c4f7f7c3si4853327ejd.924.2022.03.11.12.21.08; Fri, 11 Mar 2022 12:21:09 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DDB768B180; Fri, 11 Mar 2022 22:20:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2A9D68B0AE for ; Fri, 11 Mar 2022 22:20:44 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nSlkh-000ALY-6r for ffmpeg-devel@ffmpeg.org; Fri, 11 Mar 2022 21:20:43 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id SlkhnmrBKSgGFSlkhn1HyA; Fri, 11 Mar 2022 21:20:43 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id SlkQnpPFWfYHNSlkQnA8YD; Fri, 11 Mar 2022 21:20:27 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=MrIxV0We c=1 sm=1 tr=0 ts=622baf1a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=70Xr_Je94ItzoZH1SN0A:9 a=VlZU0XKO32wA:10 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 11 Mar 2022 21:20:23 +0100 Message-Id: <20220311202025.28139-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNOEveajwU6B/tC4kYSpS4k9g9wv6WcsJFwDaQ6Je9UL/iDXfBcohbkFdffEwvJMm0tKF8TGsNic5XOWxkI0DTox7cnc8A1gyIcXTwZbCxjSYdNVb1A+ NovQ84tYHzD58pYxIL6k3geBkJJFwneuS7ApZa7YpUwTSFZcxytQnn3ewde07elVbVGjKg0WcJ3rNw== Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/mjpegbdec: Set buf_size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SsScGNhsWAzZ Fixes: Timeout Fixes: 45170/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEGB_fuzzer-5874820431085568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mjpegbdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 218be41192..c3d3125142 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -57,6 +57,7 @@ static int mjpegb_decode_frame(AVCodecContext *avctx, buf_end = buf + buf_size; s->got_picture = 0; s->adobe_transform = -1; + s->buf_size = buf_size; read_header: /* reset on every SOI */