From patchwork Sun Apr 16 22:25:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963410pzb; Sun, 16 Apr 2023 15:25:39 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpOGbHYCyiiXS8yzeFLJ7UVKJPAjVKfoAdZHAs/ZpGemH19hpBn/qZ9QE+J1WgtnJMKncB X-Received: by 2002:a50:ee95:0:b0:506:9495:9b5f with SMTP id f21-20020a50ee95000000b0050694959b5fmr4630300edr.38.1681683938859; Sun, 16 Apr 2023 15:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683938; cv=none; d=google.com; s=arc-20160816; b=ll6g2+tctqwNs1HvsEo/Ia+UOnYhhVMpaXuzc1rJoNCFReTuudeCXMCORYadUwGK6i 0EXBs4670mdMiHywbJeIvdXOBqvPX+WqOxrZ9uIz8XWUBXhdqoFZm1P/Cy+WQ8WMVihX j5CGvCuvjADhAYgRin/rUjoY5Du31uJEJ40yanHMW5q7MqbVaMZNfFeS8j7TQoZc6YkZ K896uaVu6qUIvwSThZhf3VdzUmnbLSmkQ9mqyJp9u2JBAUG9DQI1PqLzEHqQsbF9a2zl TpLAlJHL7Imhpqx2ERBU2P3PX/1AlPnHjJ18Ml8xea/RA2Iz73VxiUyhU76u6iZfjE2I OcCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=KgJdx5QIE/bty58AlWj2VBNzUZwWO9UoNpt5+LuGRcI=; b=gJpaAmapnHUrYzSzv85MK4MBP0OyoqSUI9zk/TWodxgRoTYrewS1CfW0bYD1hh5zLy ZTJfcG3CFfBhXHJNhh5tiAwxdoTmivQJJKaxF66qgf0rn5M7rjtCW50/SF3royrSQONK ELrPFQ8s7WMDIkKYGOZZOW1D7rT9a1jhE95VO5THlmWZKhHPWjCUSIffywxHtWlRLDo4 AIttYT+COjhBHFYqp9o4tOsRJPdOa7JZa+EgKE6e2jpRGLz8ecMgSjrFdxxSVsSdM5KT DS0PY/07oymCVLw/2tyjBsAOW4hxsgdQb1Wad4/cKt1MOfCYH5LASoCU5VXmVYIH+aEK XPMA== 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 v8-20020aa7d808000000b00506a7b4efacsi533374edq.414.2023.04.16.15.25.38; Sun, 16 Apr 2023 15:25:38 -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 D65C96802C8; Mon, 17 Apr 2023 01:25:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 553FA6802C8 for ; Mon, 17 Apr 2023 01:25:21 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 5EE4EFF807 for ; Sun, 16 Apr 2023 22:25:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:15 +0200 Message-Id: <20230416222518.21308-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416222518.21308-1-michael@niedermayer.cc> References: <20230416222518.21308-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avformat/avs: unref packet after avs_read_audio_packet() fail 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WFn2R0/rjSgS Fixes: memleak Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_dem_AVS_fuzzer-6738814988320768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/avs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/avs.c b/libavformat/avs.c index ab47980a11c..2ce8b19c412 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -156,9 +156,11 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt) uint8_t palette[4 + 3 * 256]; int ret; - if (avs->remaining_audio_size > 0) + if (avs->remaining_audio_size > 0) { if (avs_read_audio_packet(s, pkt) > 0) return 0; + av_packet_unref(pkt); + } while (1) { if (avs->remaining_frame_size <= 0) {