From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DD13944DA2 for ; Fri, 23 Dec 2022 18:39:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D39E968BB91; Fri, 23 Dec 2022 20:39:08 +0200 (EET) Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93F7668A708 for ; Fri, 23 Dec 2022 20:39:02 +0200 (EET) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-144bd860fdbso6823169fac.0 for ; Fri, 23 Dec 2022 10:39:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=GdT3xYxqFDCOFIe+EgDp0ctOzZMTfu08uvz1NeiALCw=; b=N51vEGW1YA2quxgdvQ056U9v+5narvxLT5251GmHiQxYmUGPEuXrPAWvvOwgDGHIH8 VCiB3udLjXy+5HOnGqha52IJiNW+zA0k6Xx3iYV7YHf8ihJ74+uuyaRCyIckd1z5Ft6Y OSUV4kHj7N20l9Yzerz606rTSE31iesHNCXHa4HtF93bOY9wqa0dNSXl0kbK3Tq5wkyG y/f5jFCboaVuE1LOtRuAlHbigork2d57tu4/VCfSOIUPvdblqgSopD71m+yoCf0FpSvM dW5ego4RfZ1bJKMIlL6/Kbfyq+GxBB1wk/sP2CPt/dIn20mczRDtuvuPjJZrwCJN+noC t/Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GdT3xYxqFDCOFIe+EgDp0ctOzZMTfu08uvz1NeiALCw=; b=5s/gBrh/aUblSX1cExOHDMA5cCnb0Wp5q6m9XFtPnWc7afyH6JiJDbMXdE48uO90WW SBSWVCXLnqqUrIvEf8/6HysgDt3Krp7ksDOv94D65Y1nndC5DAfTdM4EUyF0vcVrkqOj QUeo8heAqdxTL4ysiuH46JKZxmvQQIFpqQwL4xVGU/iTpji9sJhBk0acFXOt8oVyJgiY 6Cz+YaSvwA8No5hiFfEQaT4Uya9QvYZyatjX9KVZTROGJxL+F61DYXXKMf9Rana/TvqS W6R5QLlU02J+nvXJUiWPVeQJIDN/xyv8p3aagQj5/lDbC+jZ5cXaoFf5y/R7teCwh29R BznA== X-Gm-Message-State: AFqh2kp/HB8Fke6+yRqax5/d0DORmC5rp1LIw3ZbbLYwOOA1HXOgZSKK A6QlvBkvSV0ey3MVRq5uangvFGtcvoo= X-Google-Smtp-Source: AMrXdXv3HwaV7AskoJTijldMfxXYcLj/DzCM0tZCyuGJ/oMJRz1tJwHC7TO9T4Fa5KJ7/x/3Lun7hQ== X-Received: by 2002:a05:6870:3c0c:b0:13b:146:b7ef with SMTP id gk12-20020a0568703c0c00b0013b0146b7efmr5059219oab.14.1671820740752; Fri, 23 Dec 2022 10:39:00 -0800 (PST) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id t14-20020a056870638e00b001447a2a34dfsm1813606oap.40.2022.12.23.10.38.59 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Dec 2022 10:39:00 -0800 (PST) Message-ID: Date: Fri, 23 Dec 2022 15:39:35 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221112234401.24158-1-michael@niedermayer.cc> <20221112234401.24158-2-michael@niedermayer.cc> From: James Almer In-Reply-To: <20221112234401.24158-2-michael@niedermayer.cc> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 11/12/2022 8:44 PM, Michael Niedermayer wrote: > 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); Decode callback decoders don't return EAGAIN. If they don't generate a frame but there was no error, then they return the amount of bytes consumed while ensuring got_frame is 0. > *got_frame = 1; > > if (!s->lossless && avctx->debug & FF_DEBUG_QP) { _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".