From patchwork Fri Apr 12 13:09:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LuMingYin X-Patchwork-Id: 48029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp251160pzb; Fri, 12 Apr 2024 06:09:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPo9FpBCaLsvgm1YCsgF/qMcebIbWJHKnXIk45XLHAkY4yiEbJJVeU97O1bY437zdh95afbB4Z+z41aUCSS8vnNUwwb5mv1NuTZw== X-Google-Smtp-Source: AGHT+IGEnl8c5V6dWomKk+h6K7aI/HJRfgKIMlRREdz29tko43RqrE3CNnx+o7OI0/hxgpul5ZV0 X-Received: by 2002:a17:907:26c9:b0:a52:3451:8a17 with SMTP id bp9-20020a17090726c900b00a5234518a17mr1434030ejc.7.1712927393125; Fri, 12 Apr 2024 06:09:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712927393; cv=none; d=google.com; s=arc-20160816; b=z7r0Yyshtziuh0Pd7Xkh7341/xBWR1nE7si4/IuUWyMVHqQQZfA42xoWr5gQXZZgmg Z4xTG5qAp6SzmJ34Z/pfZu3Ezv9cv4g50TrzL2oRitQp6O9JVCHNspbHqD68srAzU4tg 1NmwYJyCzbaXut4vg/mGnkkY9WOjtwbxuBK9IMQBa4OJnDjrmKqH8K/cvz1XAOT8PwcX cpNhS/1GIucy52XrJ/MtRWmBjIxPdvekNkC9WHqXi/WI/5fCOZ9kovXT/W/VU8I4TC02 bs00GeYUx5rznert0SiJqIuIE0v+OgcQZv78K1R4A0he0dwxozeCK5KEZuMcL0mKQqmq qwcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=7n96HCCMQp6mvge3aYyevzHggrmPG53yUn8zEvZPX7M=; fh=h93Jk9zXtjyzsFd9PKvKbdVr/RKQn4bW7LGFE3/Lh8E=; b=O5vsNJ9zp11B4aXB9aio7hFROutEukMsNjD2XDUNyeAYU052xufOkmvzo1dYL4nkAe EllzJpPVUsPNF393/RtW4LfzPt8s+jh9Cz+ia33Cyn0I8BRAIPYA31m/GyEBfb1BGBHG qx4orM+s8HdExTkt04AaoutocmpKIVBDYkaFQcUPftzgYOkTk502HKPFem6pzMj3Nkxz gz2xPY8lmW44O/oLnTecra+Et72XO4JGMtoLJ8BOPJhO8BhD5abtcIeYqBj7C+/z0HRH sKgroZe+n1hWgasGXBfl4Jvc94fSqVKykgDxavj4p73hAuphlzbXQMHlqSx3OB6r2SKI OTkQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b=iLPeDcIj; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a15-20020a1709066d4f00b00a51ce3feeb3si1696186ejt.437.2024.04.12.06.09.52; Fri, 12 Apr 2024 06:09:53 -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=@163.com header.s=s110527 header.b=iLPeDcIj; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F77D68D265; Fri, 12 Apr 2024 16:09:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B37568CD83 for ; Fri, 12 Apr 2024 16:09:42 +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=t2urI 1mBH6j5OfZjaBMG/1HUIagHigEmTxVxLFO1EjA=; b=iLPeDcIjacKF8tJIJAcNN uoHWhaEr2p8Gd5ovdp3+sOiyxgEZeJMR9MQyN03C4/fuK1czuLyGsuaSK4+AkSk7 huXkcJSBsl9t2wNDlDrJLNtGXuuswiV6rkKsMZnTzYJD+ywYopCf8DUVgh/TgPNq vh52IsF3ehiMabFxEjpNq4= Received: from localhost.localdomain (unknown [111.198.54.11]) by gzga-smtp-mta-g2-3 (Coremail) with SMTP id _____wDXf5yRMhlmlqi0Aw--.59897S2; Fri, 12 Apr 2024 21:09:38 +0800 (CST) From: LuMingYin To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Apr 2024 21:09:35 +0800 Message-Id: <20240412130935.1368867-1-lumingyindetect@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wDXf5yRMhlmlqi0Aw--.59897S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AF4UCF1kAw4ftr17ZFy3twb_yoW8WrWDpr WrZFWYyrWDXrZ7tw4kJw4kWryFkws3GryI9rWrt34UW3ZxJr9IkF42kryavFyfurWkCa1Y vwsYqryUG3WDZaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zRbo7_UUUUU= X-Originating-IP: [111.198.54.11] X-CM-SenderInfo: poxpx0hj1l0vphwhu3i6rwjhhfrp/1tbiTxO+92XAlYJGxgAAsn Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: fix a 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +IdmfC4VUuV6 In the file ffmpeg_mux_init.c located at /FFmpeg/fftools/, a pointer variable named pts is defined at line 2830. At line 2836, this pointer is allocated a dynamic memory area using the function av_malloc_array. When the if statement at line 2852 evaluates to true, there are two possible scenarios. The first scenario is when nb_ch > INT_MAX - size. In this case, the program should release the dynamic memory area pointed to by pts before returning. The second scenario is when the realloc operation for the pts pointer fails. In this case, since the av_realloc_f function releases the original memory in case of reallocation failure, there is no need to release the memory area pointed to by pts. Because the handling of these two scenarios differs, to fix the memory leak issue caused by the first scenario, my patch separates the treatment of these cases. Signed-off-by: LuMingYin --- fftools/ffmpeg_mux_init.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 6d8bd5bcdf..1f27e4e4f4 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2849,8 +2849,12 @@ static int parse_forced_key_frames(void *log, KeyframeForceCtx *kf, unsigned int nb_ch = mux->fc->nb_chapters; int j; - if (nb_ch > INT_MAX - size || - !(pts = av_realloc_f(pts, size += nb_ch - 1, + if (nb_ch > INT_MAX - size) { + av_freep(&pts); + return AVERROR(ENOMEM); + } + + if (!(pts = av_realloc_f(pts, size += nb_ch - 1, sizeof(*pts)))) return AVERROR(ENOMEM);