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 6B72544154 for ; Wed, 28 Sep 2022 14:17:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B136268BCF3; Wed, 28 Sep 2022 17:17:24 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E138368BCE6 for ; Wed, 28 Sep 2022 17:17:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5E041240183 for ; Wed, 28 Sep 2022 16:17:18 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id wKtQ_oiZvnNl for ; Wed, 28 Sep 2022 16:17:17 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id A87902400F4 for ; Wed, 28 Sep 2022 16:17:17 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id A27761601B2; Wed, 28 Sep 2022 16:17:17 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <2fbbb930-fafa-8fea-b7c4-fd2a15289958@gmail.com> References: <2fbbb930-fafa-8fea-b7c4-fd2a15289958@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Wed, 28 Sep 2022 16:17:17 +0200 Message-ID: <166437463764.22057.4742937177788601515@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] libavformat/flac_picture: Don't return AVERROR_INVALIDDATA for errors with flac picture mimetype 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting James Almer (2022-09-10 03:16:32) > On 9/9/2022 7:44 PM, Will Cassella wrote: > > In the case where the FLAC picture MIME type is not understood, fail to > > parse the picture silently rather than return AVERROR_INVALIDDATA. > > > > This originated from a bug reported in Chromium: https://crbug.com/1052821 > > > > Signed-off-by: Will Cassella > > --- > > libavformat/flac_picture.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c > > index b33fee75b4..1acad9b251 100644 > > --- a/libavformat/flac_picture.c > > +++ b/libavformat/flac_picture.c > > @@ -68,8 +68,6 @@ int ff_flac_parse_picture(AVFormatContext *s, > > uint8_t **bufp, int buf_size, > > if (len <= 0 || len >= sizeof(mimetype)) { > > av_log(s, AV_LOG_ERROR, "Could not read mimetype from an attached " > > "picture.\n"); > > - if (s->error_recognition & AV_EF_EXPLODE) > > - return AVERROR_INVALIDDATA; > > If you don't want to error out, then don't enable explode mode, which is > meant to abort on the slightest issue? IMO failing to recognize the MIME type is a lavf error rather than a file error and so should not fail, much less with AVERROR_INVALIDDATA (should be ENOSYS if anything). THe other error should stay though - then the file actually is broken. -- Anton Khirnov _______________________________________________ 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".