[FFmpeg-devel] [PATCH v3] fftools/cmdutils: Add av_freep() to avoid memory leak

[FFmpeg-devel] [PATCH v3] fftools/cmdutils: Add av_freep() to avoid memory leak

[Jiasheng Jiang]

Add av_freep() to free new_elem to avoid memory leak.

Fixes: 3ca1e31e63 ("fftools/cmdutils: Atomically add elements to list of pointers, fix crash")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
Changelog:

v2 -> v3:

1. Replace with a correct fixes tag.

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".

Re: [FFmpeg-devel] [PATCH v3] fftools/cmdutils: Add av_freep() to avoid memory leak

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 869 bytes --]

On Tue, Jul 15, 2025 at 12:31:09AM +0000, Jiasheng Jiang wrote:
> Add av_freep() to free new_elem to avoid memory leak.
> 
> Fixes: 3ca1e31e63 ("fftools/cmdutils: Atomically add elements to list of pointers, fix crash")
> Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
> ---
> Changelog:
> 
> v2 -> v3:
> 
> 1. Replace with a correct fixes tag.
> 
> v1 -> v2:
> 
> 1. Remove the unnecessary return NULL.
> ---
>  fftools/cmdutils.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)

will apply

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The day soldiers stop bringing you their problems is the day you have stopped 
leading them. They have either lost confidence that you can help or concluded 
you do not care. Either case is a failure of leadership. - Colin Powell

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".