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 3A4BE43DA3 for ; Sat, 10 Sep 2022 01:16:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D17F68BB14; Sat, 10 Sep 2022 04:16:42 +0300 (EEST) Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B45EC68BB0B for ; Sat, 10 Sep 2022 04:16:35 +0300 (EEST) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-12803ac8113so8361178fac.8 for ; Fri, 09 Sep 2022 18:16:35 -0700 (PDT) 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; bh=LCANx/5dzLbIznwxXfGqPMrGDWq3+WbZp3DXjfw85ZU=; b=lxfIUh8T8M0G9MHawPMW0ma/dqfOny7AzAm17lgwyOpW1ZK3GQBGXeXHGsW8bkmwEf FEwWsodXX69KgHFZTdRAcfYjwvn3EOHaZ/x8Yg+6+L1O10ou1UCUDA/43dsx+2xfdAcK 8t0pq8TSybuQahC47GnpNxz7kgA35LxPCG1R8F9HKgnYuLI2Y40z54bGvoWSj4UbxApa JCf/C3CVUHsFa7hK4P7JINCNLdT2Gu1nsbSv1F4z+ogA37XlEAsokHIvP6Xnp20VDkxX jH0lTAC33YfuF6S/IUO/M6Mc7yk1CkETFGYRlmcnmysFEbggZn2Y6ekIne6XQExj76A5 OEVQ== 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; bh=LCANx/5dzLbIznwxXfGqPMrGDWq3+WbZp3DXjfw85ZU=; b=hB2sr1Lf676gg8RoqJHvi89cjffcA1e2iC3qpZFOCsyiAU8bHHNDGTFnr74lMaXu6Q Y8bCJMQl5kFmePe5AmRApzRHOl/0Z2M5qguWue+IWl6FYhrdwyp1IdGBC7AU1Fx1NXJR A+FdkFGzCzXzYyk3XfU2UzMoMS4fKjGMotZArI1eII6YMT6R5IBlAxP6m6G0JN3la1uf s4BjsALKeDFMDRv4FL8UIXZpYQAAVD5op1TdFrWlpuGuiW3gJ0T0Z5yrXlC/kW/VLiUk 4UvvS/yx4UmG5KJZcggzZEMq+3XMzS4SN1XfRWdsc7a3zXDyLed+HJW8SpS4ZtbW7Gd0 CjOw== X-Gm-Message-State: ACgBeo2NIVCcJf4R+eW1Zi/OhaxElS5uBWnWFkGYP5ErfikGsQ8jlCNU gtWjNDLMlxMpP1wu9c/FTbXTqT1sd2M= X-Google-Smtp-Source: AA6agR7Lkk2s9XReSTIJDVdU0D0epbIFMvvcPDlNOf1/K1gpXly+6f6smHr+TToAkpa5fzU45Kc3Vg== X-Received: by 2002:a05:6808:1b2a:b0:344:b633:50f8 with SMTP id bx42-20020a0568081b2a00b00344b63350f8mr5073836oib.42.1662772593974; Fri, 09 Sep 2022 18:16:33 -0700 (PDT) Received: from [192.168.0.13] ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id o8-20020a9d4048000000b006370c0e5be0sm552825oti.48.2022.09.09.18.16.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Sep 2022 18:16:33 -0700 (PDT) Message-ID: <2fbbb930-fafa-8fea-b7c4-fd2a15289958@gmail.com> Date: Fri, 9 Sep 2022 22:16:32 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: 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-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 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? > return 0; > } > if (len + 24 > bytestream2_get_bytes_left(&g)) { > @@ -91,8 +89,6 @@ int ff_flac_parse_picture(AVFormatContext *s, > uint8_t **bufp, int buf_size, > if (id == AV_CODEC_ID_NONE) { > av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", > mimetype); > - if (s->error_recognition & AV_EF_EXPLODE) > - return AVERROR_INVALIDDATA; > return 0; > } > _______________________________________________ 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".