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 62E1649E1F for ; Fri, 12 Apr 2024 16:45:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5ECCB68D28A; Fri, 12 Apr 2024 19:45:00 +0300 (EEST) Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DF1868CE20 for ; Fri, 12 Apr 2024 19:44:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=tynTP i+GwYq9mdpA4dPPmw+6KrUu6fH1G7iiPeVD864=; b=FhLnMqpZvmvNBsmbXFay/ 5U6mNotA6ehJaLF6Hegt8025/N0chC5TP+aBsbA7HEEz0ko6785ZC8szerrQ/egC j3ComLVUWxrSQ2cla+3iQg979k2a34qX4huN01vBsScjEYGHMhxEZSnrRyx+dFZE Z6SipMEJ+y9aUZMtW3hD/w= Received: from localhost.localdomain (unknown [111.198.54.11]) by gzga-smtp-mta-g2-4 (Coremail) with SMTP id _____wD3n2j7ZBlmjozWAQ--.50272S2; Sat, 13 Apr 2024 00:44:44 +0800 (CST) From: LuMingYin To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2024 00:44:41 +0800 Message-Id: <20240412164441.1727089-1-lumingyindetect@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wD3n2j7ZBlmjozWAQ--.50272S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrKF1rJF1UtFyDAr17GFWxWFg_yoWkGwbEgr yxXF18Wry2gFyxCws5GFs8KrWkKa9Y9Fs3ur47tFy5Arsrta4qkFs7XF93ZFySgw4Ikr9r Gws8WrW7Gw4YkjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xR_5l1JUUUUU== X-Originating-IP: [111.198.54.11] X-CM-SenderInfo: poxpx0hj1l0vphwhu3i6rwjhhfrp/1tbiKR++92VOCczROwAAs7 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: fix memory leak in ffmpeg_mux_init.c 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: lumingyindetect@163.com 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: Signed-off-by: LuMingYin --- fftools/ffmpeg_mux_init.c | 7 ++++--- libavutil/mem.c | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 6d8bd5bcdf..e7e2281bd0 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2851,9 +2851,10 @@ static int parse_forced_key_frames(void *log, KeyframeForceCtx *kf, if (nb_ch > INT_MAX - size || !(pts = av_realloc_f(pts, size += nb_ch - 1, - sizeof(*pts)))) - return AVERROR(ENOMEM); - + sizeof(*pts)))) { + ret = AVERROR(ENOMEM); + goto fail; + } if (p[8]) { ret = av_parse_time(&t, p + 8, 1); if (ret < 0) { diff --git a/libavutil/mem.c b/libavutil/mem.c index b205d3fb25..7f34765fe7 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -177,11 +177,14 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) if (size_mult(elsize, nelem, &size)) { av_free(ptr); + ptr = NULL; return NULL; } r = av_realloc(ptr, size); - if (!r) + if (!r) { av_free(ptr); + ptr = NULL; + } return r; } -- 2.25.1 _______________________________________________ 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".