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 283AD4105E for ; Sun, 4 Aug 2024 14:23:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E15068D96E; Sun, 4 Aug 2024 17:23:27 +0300 (EEST) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0D7168D95B for ; Sun, 4 Aug 2024 17:23:20 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0FCB11C0004 for ; Sun, 4 Aug 2024 14:23:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1722781400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KQHrfaYjGBvnwsGWpVcjIGsH3Sz0D2r0/2STGSMnSts=; b=KhNGw5isOpKHDIQy8vK3kj78/HfFHlPxa8EY3rekWsnzy9fYKRQTAoZlyGxW+w34l4P6ZI YQ1DqixP/ExxcfUlu3Xgo+1OwYtaXmWwBldlo6XEE7SfSB9k6KGELQ3X21soZqf/9yUzoN uGeVRSv6xJZF64N/QN5A59EKTaZNOft4qrhpAXteOgv28/Wq1/mEMcSESeW3qX5ejw5BQT l5DmDv28j3/dIuINdYzv5BNYyVH2gNc8u6vDPQedFRAFlTfWzlc5gUPFeQZnJF8mMnaX9Y 7XfcIrSbgFjSt1JhBTgLk/sYaGoN2BkKdrkDlxufoTF3chYWLctyXQcXoTYN8g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 4 Aug 2024 16:23:15 +0200 Message-ID: <20240804142315.1430389-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240804142315.1430389-1-michael@niedermayer.cc> References: <20240804142315.1430389-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avformat/wavdec: Check if there are 16 bytes before testing them 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: Fixes: use-of-uninitialized-value Fixes: 70839/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-5212907590189056 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/wavdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 00856a5eca2..78e37b88d75 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -874,8 +874,7 @@ static int w64_read_header(AVFormatContext *s) uint8_t guid[16]; int ret; - avio_read(pb, guid, 16); - if (memcmp(guid, ff_w64_guid_riff, 16)) + if (avio_read(pb, guid, 16) != 16 || memcmp(guid, ff_w64_guid_riff, 16)) return AVERROR_INVALIDDATA; /* riff + wave + fmt + sizes */ -- 2.45.2 _______________________________________________ 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".