From patchwork Tue May 14 20:02:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 48882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp1184216pzb; Tue, 14 May 2024 13:02:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxWj39Ek3wtIsLkmB1LDXPFB+SnLED2ApyXJ5EhphR0s6wUplvweU0bXFl/TivZQvI6iJWTfCo6UP2PLcFYO3zV24hXt15XsRZvQ== X-Google-Smtp-Source: AGHT+IFAAcIS8+PGx+qHnsg9sswaWjO58lmGde7NNH5uW5E2oBb0fc/DXhZWQFqyxWZOEccK44WI X-Received: by 2002:a05:6402:5154:b0:572:58d3:a6bf with SMTP id 4fb4d7f45d1cf-5734d6b2ed1mr10864322a12.2.1715716972028; Tue, 14 May 2024 13:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715716972; cv=none; d=google.com; s=arc-20160816; b=fjEhqNr1aU7O7pUBa//sZoSl8ZW9eMHXsamkPDu52BNS3cnSy3/P+aUZIwyNS69ciy XJZo7D5Hjl1aiEY4wodvWAYx9czggkr5z0n+h8aIJHwFU3iF30IeylmJYmWQWPKJrktc eRZTCzXfaimrQZ1Qp7ZxhyOOg8dmdP4c3gX80/xUtOXsvi/F1U6EupCpLT8wlxst9HC5 WTmMEvawRkc5VFXB79Y6c8tfPGciz/USYQrDEVDIHPjpN6GU12Bq8evgFGojIDlLjOsz gQz9pUdbAOF7M3lYhxoWHgp899mdypczgUUB7pwslHVtKJ9d/TS26Wpo7qLDOjvTNWQ2 iPSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=kLVGrg/fVRU0hLJUDpGw0Lk3WvbC0Xptv8Lo9floyOs=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=JfFeXWK1GZyRMEDq7BxbzUCjRX/vNtgGfmlyOAp8p8R5F+8sXsevSHRtVXSF7LuRsd poUM22l+zsVBI+xZ1Q0/+BMP/AYH1iDPjWCg4fdFFfh4fsNbfybXfDfoQVWJl0pAFfdJ /p7jqFU1iNfCZIosK7j1ADZc3SN7H3BI5Cn8Vo879v4g1JVRrUVfBY1uoOkMf+vEZELA Z0/mMvOkac/586pOx5a9rJw0M5Eel8Z8GadL6nTT7RopFbraK7asgJ/6TYihOA/2C9o9 gA6mD8w/5YnvWWsPI+pmPj19BlVc3JBhzUyrGQDWy+N4dX5pLgL0wQdg7S5RKclJsBRn HzNA==; dara=google.com 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 4fb4d7f45d1cf-5733c378546si7045206a12.643.2024.05.14.13.02.51; Tue, 14 May 2024 13:02:52 -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; 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 2BC5968D73D; Tue, 14 May 2024 23:02:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FFE968D748 for ; Tue, 14 May 2024 23:02:37 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id D1255EA3CB; Tue, 14 May 2024 22:02:36 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tYoimc2Za01D; Tue, 14 May 2024 22:02:35 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 75573EA63E; Tue, 14 May 2024 22:02:35 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2024 22:02:25 +0200 Message-Id: <20240514200226.4320-2-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240514200226.4320-1-cus@passwd.hu> References: <20240514200226.4320-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mp3dec: simplify inner frame size check in mp3_read_header 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KLTtFP5xa3mh We are protecting the checked buffer with ffio_ensure_seekback(), so if the inner check fails with a seek error, that likely means the end of file was reached when checking for the next frame. This could also be the result of a wrongly guessed (larger than normal) frame size, so let's continue the loop instead of breaking out early. It will end sooner or later anyway. Signed-off-by: Marton Balint --- libavformat/mp3dec.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 78d6c8c71c..4abc73966f 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -412,14 +412,8 @@ static int mp3_read_header(AVFormatContext *s) frame_size = check(s->pb, off + i, &header); if (frame_size > 0) { ret = check(s->pb, off + i + frame_size, &header2); - if (ret >= 0 && - (header & MP3_MASK) == (header2 & MP3_MASK)) - { + if (ret >= 0 && (header & MP3_MASK) == (header2 & MP3_MASK)) break; - } else if (ret == CHECK_SEEK_FAILED) { - av_log(s, AV_LOG_ERROR, "Invalid frame size (%d): Could not seek to %"PRId64".\n", frame_size, off + i + frame_size); - return AVERROR(EINVAL); - } } else if (frame_size == CHECK_SEEK_FAILED) { av_log(s, AV_LOG_ERROR, "Failed to read frame size: Could not seek to %"PRId64".\n", (int64_t) (i + 1024 + frame_size + 4)); return AVERROR(EINVAL);