From patchwork Sat Nov 12 23:44:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39250 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1687942pzb; Sat, 12 Nov 2022 15:44:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf50n575JB5iRQ2AWKp7Ek8Z8OCOfb4knFqSQQAq6M05ml2KedrvyknW0ibR/x2WdOGk5TMc X-Received: by 2002:a17:906:141b:b0:78d:5176:c4d2 with SMTP id p27-20020a170906141b00b0078d5176c4d2mr6150292ejc.532.1668296661640; Sat, 12 Nov 2022 15:44:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668296661; cv=none; d=google.com; s=arc-20160816; b=QA0xxmtdgEWw+ven6BXgnuUPexIdPRdJclNgJNCyTVysEuCDnba49XHCK3Mf2tGak1 tLXT9JgL3XI3dtmRZVhBbfI7iUCpNS+sX3umvqe+p7ksI0C8aOMU1ZP+m5ZEcQXeRCCT zWhi71UKHhVrQjjpC3Ju7XvNfi+rGOp0fP+hM2vDl+c3++Zn0Hp3wb53pkM3ydJA0KGG wkssrxOFgJ4VrATgcD8D8OCZ5vUQ1nlVKv59Bt7+hfi+FQXgRi3mMoggaBuGs8Zhfq19 lVgv4kCa+2v3hDHrs9bM7fV3XFBl649RHla4iL2sOCrZtHSBSDHyzmRn6/7C4jj2Uqf3 bpXA== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=8JIzG2pwjHs9mxjMqnlfudqfRkrQKxD/JSCgQg/iSAY=; b=qG6jpKCctI2Ktmztzm3bQ+DkUBriODFyZYiq8R4A/FC/+nwXKCwKsYWwcfLS1/PEQd BjCd6DslLBTqmUYAC6AesKGtvubw1EEzaJ5UdvVq6ZzXBXKbYWyd7gWrwK81izkW3ryF D6rL3OG59KLK3zHfU/7QI/IRegoiaWKrf1HNeyPOUNwQy1vxgcCP3RyS7itRTS08cxWY uRRhjsgLqfQ7rqvSKkrtDGvlp4hIqLNNoM9Wj788wxhDoNH0bGO4rEdw7GrN1nGbBxck MIFyMkXay6tXub4CJ7dI9RE4DRnW8BkcyhKfsc/6OTtad+wvnrqOIUYAn/9oCMGjTTk1 qVpA== 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 z23-20020a17090665d700b007ad943d0608si4751386ejn.630.2022.11.12.15.44.21; Sat, 12 Nov 2022 15:44:21 -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 B590C68BA62; Sun, 13 Nov 2022 01:44:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F17368A241 for ; Sun, 13 Nov 2022 01:44:04 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 462F420004 for ; Sat, 12 Nov 2022 23:44:02 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 13 Nov 2022 00:44:00 +0100 Message-Id: <20221112234401.24158-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221112234401.24158-1-michael@niedermayer.cc> References: <20221112234401.24158-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mjpegbdec: Check for AVDISCARD_ALL 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: i7Ifc2WXWG5b Fixes: Assertion failure Fixes: 51825/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEGB_fuzzer-6393802688692224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mjpegbdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 98c64b44ca..a82a95d70a 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -141,9 +141,10 @@ read_header: av_log(avctx, AV_LOG_WARNING, "no picture\n"); return buf_size; } - av_frame_move_ref(rframe, s->picture_ptr); s->got_picture = 0; + if (avctx->skip_frame == AVDISCARD_ALL) + return AVERROR(EAGAIN); *got_frame = 1; if (!s->lossless && avctx->debug & FF_DEBUG_QP) {