From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C0D0E50409 for ; Sat, 12 Jul 2025 13:46:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 5495B68F17F; Sat, 12 Jul 2025 16:46:40 +0300 (EEST) Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A777D68E8FE for ; Sat, 12 Jul 2025 16:46:33 +0300 (EEST) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-70e23e9aeefso22544377b3.2 for ; Sat, 12 Jul 2025 06:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752327992; x=1752932792; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zv/KqFHYLffHMa5y1TUOkThW97pbIu78CG6/dW4eyfE=; b=P1NFttH2YRB/JjpCrQC3Ref6mhwSGZLigdrDyZxcaNKpjH/+B2y+AFm2aDojiFlrTw dd7B39D8pLlXcG5tYvJGWTcBTibkvSh6B1Ch1rdZu/gmZBAYPCmEhF6rH45PrKaDjZDo 1N1w4CVxq79Ps8QLxmUaHythiWDN8K++Iy4AWuQ8NvM9/ZSXDoyvK55QnerudTUyRBqt UUvi/i9fUN1HvaAcNrQDKzt9Munnr2VUltrW2SnDyHli+5lTsDAV9qOXosT9DCPRRucL amQabhPpMttrqxOzRdtACeAZbl01NxOTWCw3A+KX5P4G745cPsjXhvHbsNapJw+fooTg jYUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752327992; x=1752932792; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zv/KqFHYLffHMa5y1TUOkThW97pbIu78CG6/dW4eyfE=; b=tZUj1QGHpEErwL5m8VVL+ltEPCOWxhHNzo/JOH9eWX70M62ix77mOmeAaCg2gSd0ev EU17iSgM71OeTTMNOl7vZlD0B7ID1NO4joJGM2Pisvr+xwgP2OCPly7oCHfVmxcOi1hJ N7+wruzCmYnOhEv+2Q7lVV5vRbkyYl5SGME88bdyd9/3LOc5sYAfghYn+zT0wQNuvcwo EeuCNGoagdIefS6S4RmvjHTnEd8BXKhDZvuZqy8Tmt33B2QezltaaYzKT9U3VWPflJ3e 5qbyPqlr6lSdQHnTCKAmNl5h9R2YV0XhVKxAr7evNx+dEP6JotF0yfYd2s6WUMRf4UTX /OLg== X-Gm-Message-State: AOJu0YxWp3h8MsKSBCKacj0bPSKUpx7PIcAJDfmXpALr9BcBEZWGfF/K TEfeG1yGjVIEt0WV4z6ZrnA2Rw3jwSXQOBG2lKKaWy7Q1kNWUT+XHj9a3UFpYQ== X-Gm-Gg: ASbGncuvbGi01VntPEhYcrAfny//huiAauVRvwb2o3fK9Uvh/TFYrDlLNRV/PyRfvJt QxCBKcpOEWeCZi0Ghsxa3GmSAoTYFLnrkXYgcQ8If/cjYBaAlDIr7g9Apc+GUD9z6rKc1U7Wjnj 1W4QgQ/zzW46ceUC65aUrxycrhiHzMSGxfg0VEW6PcwrjUkmzo17ebTgHjqYRMNNkwsFJXPX+r5 ZhJgP5JwxypcJYQnAX528rBYw9i9cpRbhHLczmHqA0maV8z7BdidkXlpJ7q3//NqpyolHI+BE3r gg62XZ6ojAAU9L2dxqlJ5YyMSQPWuoO7wLlzqsZc3a/o2NCwY+xinlOjf377twy1obSFIeNwoeD 1ievmNq/wsEOmNfsXpYoFw0FxqYptqCXn6gHj6XVUrtaM X-Google-Smtp-Source: AGHT+IGmIihzNihjBXqCw5hRo3Nddq0zqYCbfig+19iX4SFT3uq0wh4XYRk45DbWhfKtcmn6hRDTgA== X-Received: by 2002:a05:690c:610c:b0:6fb:1f78:d9ee with SMTP id 00721157ae682-717d5baf3b1mr120237067b3.15.1752327991589; Sat, 12 Jul 2025 06:46:31 -0700 (PDT) Received: from newman.cs.purdue.edu ([128.10.127.250]) by smtp.gmail.com with ESMTPSA id 00721157ae682-717c5a1ab6fsm11881367b3.0.2025.07.12.06.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jul 2025 06:46:30 -0700 (PDT) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Jul 2025 13:46:28 +0000 Message-Id: <20250712134628.23368-1-jiashengjiangcool@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250710194149.27218-1-jiashengjiangcool@gmail.com> References: <20250710194149.27218-1-jiashengjiangcool@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] fftools/cmdutils: Add av_freep() to avoid memory leak 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: Jiasheng Jiang 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: Add av_freep() to free new_elem to avoid memory leak. Fixes: 2d0bfbd0fa ("fftools/cmdutils: Use av_dynarray_add_nofree()") Signed-off-by: Jiasheng Jiang --- Changlog: v1 -> v2: 1. Remove the unnecessary return NULL. --- fftools/cmdutils.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index e442935cae..dc093b0bd3 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1471,9 +1471,12 @@ void *allocate_array_elem(void *ptr, size_t elem_size, int *nb_elems) { void *new_elem; - if (!(new_elem = av_mallocz(elem_size)) || - av_dynarray_add_nofree(ptr, nb_elems, new_elem) < 0) + new_elem = av_mallocz(elem_size); + if (!new_elem) return NULL; + if (av_dynarray_add_nofree(ptr, nb_elems, new_elem) < 0) + av_freep(&new_elem); + return new_elem; } -- 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".