From patchwork Wed Aug 14 14:34:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51021 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a746:0:b0:489:2eb3:e4c4 with SMTP id f6csp1010106vqm; Wed, 14 Aug 2024 08:51:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVC8OrvmQLKaYe7WrqU0iTobZS1zqdyWV8I2kpzcT+68l3WHF3MJ5syj8Je8Msf0Z+Lr1jkCpScPoK3MUnZLbf5HwQkWq/q20IfHA== X-Google-Smtp-Source: AGHT+IGYHfOPBVhgmATtda3wt3G1AeXhznqV8zgNvdgeKBdIBTg/H+cNuHtMKehdH2CNIGci++1L X-Received: by 2002:a17:907:da7:b0:a80:b63b:eba0 with SMTP id a640c23a62f3a-a8366d56694mr128520866b.4.1723650672908; Wed, 14 Aug 2024 08:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723650672; cv=none; d=google.com; s=arc-20160816; b=vJbwv1f0gF7Yt4TtG4KJ6Y+ZRWk4Lon3Sh5EMFtdTe+bRXY1Wx4kyVmAn2WqIZ8Ag6 GVk0gRnsty6S+HRGA8BbX0/epVeMNQi2XCYhJcYGDepK4iPqvPzIFgU7rrqqlSiF1l6i 965Ld9bURivulbTf8xs4uLdSYBx/e+fUgHkO6F9AlSBfaecmQsebAlHFtAqqqW5v6bS+ H+xEwQmIgzkDKdvttm16ZudzhrWwpIbhDb9IS5sboxJ+mMcS1kNBy+qvTNDUuBny/Vv4 PlD9DJaVl0Bo/QMDyvtmTRPCnBAFUsuJnQ05uG7ykVNYln86oqzGk65rL16F3z+685X9 la0w== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=tVonvARQ/OpsqixZCdVENCxvFwZI3WxTCqdIwZWj+e4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NoXAdxEC6sIiCYE+/XqgvtgDnE0p5LPstpCI+tassCY8YLtpCirEUVPTMDDHsjb2VW HKVe6DcApt5Rv2MHyU5469Y3JE2KLEopA0Ry71Y4Ufs10FM68ApTz46ZOTrivkQkN5/8 tia+7Qga4BapCHjcHQbT7gq+XkcuPDWKwoKTmT2LtIfqZsva9pOqc1qyAHsiomQPl8Na G8kxScl0S0fQSnifklsijysh8u88zX/kZ3f8ALaTQW/svl0HmYJSb+xLpAohp26U2Gee 049OkSS7L94BPXXydLr2ID1DgqH20a9A/so/f52wQdGnvebOCkpYYNceRKUOzMhaZNtD Z8/g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=VMWk7fgD; 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 a640c23a62f3a-a80f415110bsi231952966b.674.2024.08.14.08.51.12; Wed, 14 Aug 2024 08:51:12 -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=@niedermayer.cc header.s=gm1 header.b=VMWk7fgD; 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 2062B68DB78; Wed, 14 Aug 2024 17:34:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2639068DB62 for ; Wed, 14 Aug 2024 17:34:23 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5DFD51BF206 for ; Wed, 14 Aug 2024 14:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723646062; 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; bh=FfBbNBRWyWX6lG5iXQ3nyW7urwvUVtwHRzmBbsZOoNc=; b=VMWk7fgDq30tV2Ayc0BnQaq5GE0oEdc3ZcxyKknHiBaCvwMmrHfEE6lrlKYM+2QgjUvrxt 2i1j962Zd24L3HdjTqD/G2Xp01FhtU0O7QZEa+E1nGmGsomzh4gPqfwtqqEI+raQhAur++ OEp3JPyVZiatxwuw2o39d/uHrq5q/86r/xPNKakwxkTM+goEJJaa0iI4liU9tSmHlsFjMr TzTzrypzaSN7bPO4txxYnr675Ija90tLDJMxSsG3r6U4JzTUNmRtWpIewf0Dp2LwqfMoiV EmnCrClpvI7l4X7gFNe/Fs6UNSatVYowZq88qstF5bRuZqoNWeuQTJojlcgnIw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 14 Aug 2024 16:34:19 +0200 Message-ID: <20240814143421.3990034-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avformat/iamf_parse: clear padding 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: IaB1+DfNKPdF Fixes: use of uninitialized value Fixes: 70929/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-5931276639469568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iamf_parse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 296e49157b0..f2b6d4fa518 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -1076,6 +1076,7 @@ int ff_iamfdec_read_descriptors(IAMFContext *c, AVIOContext *pb, size = avio_read(pb, header, FFMIN(MAX_IAMF_OBU_HEADER_SIZE, max_size)); if (size < 0) return size; + memset(header + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); len = ff_iamf_parse_obu_header(header, size, &obu_size, &start_pos, &type, NULL, NULL); if (len < 0 || obu_size > max_size) { From patchwork Wed Aug 14 14:34:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a746:0:b0:489:2eb3:e4c4 with SMTP id f6csp958207vqm; Wed, 14 Aug 2024 07:34:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzNMyhnKNhUGngx1vHQm2tMjMH1k04EpP/PhQ9QpYS8CYDo2DdRGGQiCpukqzgnP0BVwVzRNZWff3vkciP5SRD@gmail.com X-Google-Smtp-Source: AGHT+IEpwhEGqxNZMqn7ciNeLjCWPV6HVA0hsMn5G3TWTMBFqrbFCxlnHLYn8jyqpGAaVhJ4+ZJA X-Received: by 2002:a17:907:7214:b0:a7a:9f0f:ab1b with SMTP id a640c23a62f3a-a83671523ebmr116049566b.7.1723646094525; Wed, 14 Aug 2024 07:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723646094; cv=none; d=google.com; s=arc-20160816; b=Ew10KXNoaxBZeNzrvJczOUz0e71uwNbZFstuyCMigflbqLsoA4KcupZLixfnqbIqFq /JV627WJytGxMtXgKR1lw9WWCc35PMFRAO8kQFURJph90GIZDbK9V/LQjCV43a66FE+R cjqxXjvY053g7wDHHcJRfznVKvLZc0fgCNzXVhNV48e1SX3ntT0thp8xlMWLLjey/3zC HfpsncVDB2V0jiPOemZMNtYtPZpI5pcS/MPI9T5mevt1sLrGNoAJcOglJzNnf921GQYa evs4N2w1nMcFLWVFNS4XhzXi5XNe7V1g5WXMVXjvBv1jmQje9kQYpTQjXnbb+Vc0mCPB UXIg== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=f/tXjDbp3HcWwSIhF2ZMGXzAAUJs181VgT2UpcVD3BE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Q/NzYz6uav6jAo+17oSOJBv5kyEslf/LoATiFUPqF1YAi8TI9aP5uYcZt6EHf5KuSQ 1NiWu5asvadQc8OYgBLotGYF4sWeTmit3BaTy5LUAJHlpB4cXdtYM4kkkd3pS98vw7Wo OUsti3jve7fegRdcDYIcggCRZZigdyQ/M7ChmA2KIrz81nkeyxeU5qbbkOppekLXYogv HD98gLIy5t7Ph6krHWcgPEMsgeEXXh93SxzNELKmjuz6E1lFTUUkA8k9ot+SXyjLiM6v 4AJ3JpOWjYEq3J3DJTLrA1vsBXhgc1P8r+XGKvEcgJu0RbIjD/1G5TQTe4/9j++ZBKre BOIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EMfFlb8J; 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 a640c23a62f3a-a80f41ced69si230593166b.1037.2024.08.14.07.34.53; Wed, 14 Aug 2024 07:34:54 -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=@niedermayer.cc header.s=gm1 header.b=EMfFlb8J; 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 A5BFF68DB77; Wed, 14 Aug 2024 17:34:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 739EE68DB68 for ; Wed, 14 Aug 2024 17:34:24 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B673C40004 for ; Wed, 14 Aug 2024 14:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723646063; 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=1jwqWsuF1T7KuFEj8rMXN7EI5OMfOvXRF2yDDYb/82I=; b=EMfFlb8JR9TZelTL+T9ESmuQW03Vt0CzyAuz8MFR8CNFPsWXgyQUtjS9F/rJ4WbdO7zgUL a2ysTV+0REuYF6hZFPftlF6mU3vd9ihaRFHjhv3IH8kZ6t9z2zql3OhRTBzFu10aaEo5I7 8KTv5yiUsJ90zMyM2Us0eJmFiRIErwid8Rch3uAzh9DC1GA+iw0JbJ/gWw3J5ClrnEVHLF dM7v9WtLqTSZSf5UqXL4VlvubmkSZKQ7sFAi84TEgZZrjgYyymrzlqdNAg+BEKzQ543LxP Fb3aQMwZw7I2r1f6hiUPfo3EQBw2lB4CEgDnCbyLxTuUgtKyuRiD0070HH7drg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 14 Aug 2024 16:34:20 +0200 Message-ID: <20240814143421.3990034-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814143421.3990034-1-michael@niedermayer.cc> References: <20240814143421.3990034-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mxfdec: Check that key was read sucessfull 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: VFDxl4E+bl8M Fixes: use of uninitialized value Fixes: 70932/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-4870202133643264 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index af0c8a31007..4d5cb28d6dd 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1533,7 +1533,8 @@ static int mxf_read_indirect_value(void *arg, AVIOContext *pb, int size) if (size <= 17) return 0; - avio_read(pb, key, 17); + if (avio_read(pb, key, 17) != 17) + return AVERROR_INVALIDDATA; /* TODO: handle other types of of indirect values */ if (memcmp(key, mxf_indirect_value_utf16le, 17) == 0) { return mxf_read_utf16le_string(pb, size - 17, &tagged_value->value); From patchwork Wed Aug 14 14:34:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a746:0:b0:489:2eb3:e4c4 with SMTP id f6csp962213vqm; Wed, 14 Aug 2024 07:41:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWE2N/P4At2jGUUH5AWxPLMDAZS1QsIYYic3Io3zSEID4mtZhg1n+Qd1zQ2qMZvps0vSnvvV02WDPWvcOTn1GJNEysL8iQb5p8kjw== X-Google-Smtp-Source: AGHT+IGOqZTLa9x5J+CY3gmOO2v4hJfUu+e1Zire3q/hh/T8tTQDCMV3KbDCPbvioPOQCavgdImm X-Received: by 2002:a05:651c:1543:b0:2ef:2e9b:c6ee with SMTP id 38308e7fff4ca-2f3aa1c9d99mr10386521fa.1.1723646476494; Wed, 14 Aug 2024 07:41:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723646476; cv=none; d=google.com; s=arc-20160816; b=Q8k653BsRrNwYgG0nZFO/MC1fBIXXgHgSyw/EKiJZMhW9c6+s464RX6y2tJfVuv8/9 iEKYxSo+oaGiFCQ5mzVVXg8Iym4yP3T9z/9x0aFlfqIxEgtNhe0O8ooLcW7/DFYVRDnK 12Rj8b57us/NGyemNO9Y8NhmzsQkfYXgcRBROwmb/9pJeJARiJHUXw91CBckNrgu2ZA2 VYlLeKXlQ1BDsgqHY6f/IXX0J5IGibvim2VKExIM9N/t+geXxAIDhFjRY/5LXSv1xaC0 OMqg3g/1w1nWsW5/xspqfeE7GUJZMneqPCBqyMCgRYBts6UkYvMPJrysLIrjX24OX4ou Vssw== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=wDpaBE8cYOz44V5lLSEJNst/Nvck/qQp92LRjeXN538=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=XY3AvW5aoW75hcnJUMVrTUgaI9PwAEb2s6LYK/NqSzrm5csfnO3e1yROWy9X7E/Ene 8MPIeNudqpHw5QJkE5faZuGOH+MdcAc9ytZccvDja8AGgvwq7Un8MMjmUdpHLvzhFeZs 1Z0kn9j3k+9/edzb1ubhEQ9cHDDfDmHftPfnUWXpC8gu0sUyqov7f1yvu7ZZHP6F9u81 S2h96QCVSUZT1o1hDaXT8Mfx45bmZyu/QE5jexZ55ncSpKWY7I0utKej7gKkH+zlmzPM FlabRcLUnqP6TTldJcju1WvF38U6444ULSCWpUlnW5RErFMvMG0TLTEER3ADgnoKMz7K FaJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="kWKZlY/M"; 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 38308e7fff4ca-2f29203ccf6si26365361fa.267.2024.08.14.07.41.16; Wed, 14 Aug 2024 07:41:16 -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=@niedermayer.cc header.s=gm1 header.b="kWKZlY/M"; 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 15F5068DB6E; Wed, 14 Aug 2024 17:34:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F77468DB7A for ; Wed, 14 Aug 2024 17:34:25 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C1CF424000A for ; Wed, 14 Aug 2024 14:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723646064; 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=kcQLom0q5HVV9aorqbG/4WPH/nGEtcxcvshcpP8tvxg=; b=kWKZlY/M50nOQYeIqqWy3ctBGuW1sO8zsPTi6j4zOrc7c1cvS8X/6i+PiGCct5JEtigQz5 Hcy+60qMoqTkPXSAXgOyQ/GVeWFLTaWsYMSuRovHAd8VY0Qw6ODC/E1e4Cc6eQ7+71HGZI 0rWbH0xGZYWn32B9TUl60CYg14RHUetTKm4Sw6S/Jm4Knt4OL+Okj032MRE1+hxm638YGV RNTPtA95HfwehPXIoj6/KT4+5shJXnwobMryYO0kah6U/JMkGjUrfj+3xi8zewDv3cPkQ6 Br3ah2t+0tmQgO0pQ1jqVaV2ah6nYOagJewhmq4W2f1gnT8iOXsmnZVMRwl3QQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 14 Aug 2024 16:34:21 +0200 Message-ID: <20240814143421.3990034-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814143421.3990034-1-michael@niedermayer.cc> References: <20240814143421.3990034-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/hapdec: Clear tex buffer 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: wCgIWhCvsapf The code following makes no attempt to initialize all of the buffer Fixes: use of uninitialized value Fixes: 70980/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HAP_fuzzer-5329909059223552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hapdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index 918eff78761..70bf592f2aa 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -310,6 +310,7 @@ static int hap_decode(AVCodecContext *avctx, AVFrame *frame, ret = av_reallocp(&ctx->tex_buf, ctx->tex_size); if (ret < 0) return ret; + memset(ctx->tex_buf, 0, ctx->tex_size); avctx->execute2(avctx, decompress_chunks_thread, NULL, ctx->chunk_results, ctx->chunk_count);