From patchwork Sat Feb 27 22:28:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 26020 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A82CF44A4D0 for ; Sun, 28 Feb 2021 00:29:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5720668AAE6; Sun, 28 Feb 2021 00:29:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A95668AAE6 for ; Sun, 28 Feb 2021 00:29:11 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lG85G-000A5O-0h for ffmpeg-devel@ffmpeg.org; Sat, 27 Feb 2021 23:29:10 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id G84Ilow6hljeHG84IlGel4; Sat, 27 Feb 2021 23:28:10 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=0VUxYutnTPIYARF2BqcA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 27 Feb 2021 23:28:10 +0100 Message-Id: <20210227222810.1462-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210227222810.1462-1-michael@niedermayer.cc> References: <20210227222810.1462-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfH82TPUaL27E2tvi1a+qRqZyQQPW0OzGKsuxVrR0hy82XSVUxIcXvduCCnz5zVpeWoo7jvh4hrQBcVWnWtVgU5C9q5s21y0e89d4viSN+qQ4DvI0fjeo 3/C6nd8bsQZOa6/UCOrSANuxJ8OCu1DHeT+rVWoAkxdWOquRnLF1n/lm Subject: [FFmpeg-devel] [PATCH 2/2] avformat/samidec: Deallocate hdr_buf X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes: memleak Fixes: 30841/clusterfuzz-testcase-minimized-ffmpeg_dem_SAMI_fuzzer-4521799196999680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/samidec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/samidec.c b/libavformat/samidec.c index cf5076c7b8..d84f56ce6f 100644 --- a/libavformat/samidec.c +++ b/libavformat/samidec.c @@ -89,6 +89,7 @@ static int sami_read_header(AVFormatContext *s) sub = ff_subtitles_queue_insert(&sami->q, buf.str, buf.len, !is_sync); if (!sub) { res = AVERROR(ENOMEM); + av_bprint_finalize(&hdr_buf, NULL); goto end; } if (is_sync) { @@ -97,6 +98,7 @@ static int sami_read_header(AVFormatContext *s) sub->pts = p ? strtol(p, NULL, 10) : 0; if (sub->pts <= INT64_MIN/2 || sub->pts >= INT64_MAX/2) { res = AVERROR_PATCHWELCOME; + av_bprint_finalize(&hdr_buf, NULL); goto end; }