From patchwork Fri Sep 9 22:44:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Cassella X-Patchwork-Id: 37809 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1194531pzh; Fri, 9 Sep 2022 15:44:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR5m7+WPtrYY+g3he/F7dvXAd4z2Ygdt1EfjC5S2hIHDVmgiEhGBpUffjQoY730X9KV2Syqc X-Received: by 2002:a17:907:8a14:b0:731:2198:627b with SMTP id sc20-20020a1709078a1400b007312198627bmr11565309ejc.635.1662763476674; Fri, 09 Sep 2022 15:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662763476; cv=none; d=google.com; s=arc-20160816; b=rA7hQnvOfpswsxKDNXUpVpKi5+IvH0YR720x82ksi5GdLt+usoZaezU/v3+z51Scce TZ+8ewkCN0D6cGd1cZKXawxkmru2XIVI1iOYlajxrGxd+SgeT+Pc4fuZpEqW0dYZREZK m4IMeOUM6vPZ7qqmXyMULCA1KFC7m2pDczVCCGXEGO65IzjZmcxTuAUZzkKycWpyPLcq wggJlUu12iLYyyJcwL0zmtXNf2XApYaWL6BtOx4uN3Kek3FO8xq+c/aF31ZYUIor6e4k f7kk3gCG4ExAWqAswLCQerhJhKqlJRahYIHF44DityvkDV87zfc8Cr2mITGjiMT6FInd KMQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=u+w1hHltXkK/6aD0RhUYFEgFKuMfM1Qw2fHqd3bd2QA=; b=yNW85xur58MRkRfEw5xckLePQg798Qnap/KSn2mR4hb7doiZr+49o/Q6lRdYnFAxOL 5FZNMA0q+WAB5fGwEz/YMLNtmYJ4ZZYAFE35zw8fREX8+eIQ8wBwUhC9iK+ozwpD8aQO lYhDGLLucuQ6b/jrzI1cqPIGrzpr+Mf6rlC47pOhJ5bwU6ChSF69tOLXbEY41RGhGOb3 x8W63SjVhfc9G2m1pqozWdie70F/1pT+sx9hS3oWeBtS9Rl0NcCx5D8M83K7zSyNkjUw ARyvFm15Ehj9vvcEHUEnE946ttOLX1U8HNEFNIxRjviqkkyUQzugbc6rpqCpEihksCZY 7aNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=dAe5eoWy; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r10-20020a1709062cca00b0072b3a874867si1314275ejr.874.2022.09.09.15.44.35; Fri, 09 Sep 2022 15:44:36 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=dAe5eoWy; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A09168BAD1; Sat, 10 Sep 2022 01:44:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f194.google.com (mail-yb1-f194.google.com [209.85.219.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6EB168B6F7 for ; Sat, 10 Sep 2022 01:44:25 +0300 (EEST) Received: by mail-yb1-f194.google.com with SMTP id 202so4681216ybe.13 for ; Fri, 09 Sep 2022 15:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date; bh=yxYCt37isdgOBMZV48ZmKUme9zLOTyd7DqsQAP8gsgY=; b=dAe5eoWyR6LCQc45FQn0JWvAqMVWt2xNNR+7ViNNVa/b0B5DleSC7hmZWMP9mB6xgg /NddEw4mzgsh32uc8kNnVaiQZAXBGC7mX/LWgVfpWzMJtLa5eMKKagK5pp7QLRgFoxSN d0x5G4pymF6ng8LgCziSmqQZ9SuoRn2kYxR+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=yxYCt37isdgOBMZV48ZmKUme9zLOTyd7DqsQAP8gsgY=; b=mHBXkd/YLa4d20raDcUtJVt4clokNaqAZ31IfzP4L44IbIyaWOP7Lp1VnGPge0lsXQ 3bYonqw9tuceOXiAANpPDnthGF6I5p1B+FCJT17aNFfhonnyQIVnwWZ+A4rJaMuuIhpc hAPXWxrbs8BKSENkE3kqsgydTHPanpdkzO54K+/OGlqhA6s5W805+EQ0qsGrslH9UWkz dD1Z+feRcKJkS8gbXNHRVUB5QswJ2uiheQ28o4kxkCFo05qlzb6JDHqbUZvOHZz+f1ZC Od7QCntIDBjGyhKkW9GhSrJ88gd+IOHyR/3U+v8PwnkVTUGch5g+mY9h1xNkCiVKLDSk BQ3A== X-Gm-Message-State: ACgBeo2niHUsVz4yZeAZrcqL+tyK8jKDNkWmCrb+mupdCtmCKte+Pi/a OzzBCrOQ2nME/7Cch9wh7NmWP8tCobmmC/bIvCg1yVByimVe9JqrN1aFIWRH X-Received: by 2002:a25:7356:0:b0:6a9:571f:7ab3 with SMTP id o83-20020a257356000000b006a9571f7ab3mr13428719ybc.100.1662763463180; Fri, 09 Sep 2022 15:44:23 -0700 (PDT) MIME-Version: 1.0 From: Will Cassella Date: Fri, 9 Sep 2022 22:44:12 +0000 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iZaofwYAiUy3 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(-) 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; } 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; return 0; }