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

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

[Jiasheng Jiang]

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 <jiashengjiangcool@gmail.com>
---
 fftools/cmdutils.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index e442935cae..5c8d09f87a 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -1471,9 +1471,13 @@ 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 NULL;
+    }
     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] fftools/cmdutils: Add av_freep() to avoid memory leak

[Michael Niedermayer]

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

On Thu, Jul 10, 2025 at 07:41:49PM +0000, Jiasheng Jiang wrote:
> 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 <jiashengjiangcool@gmail.com>
> ---
>  fftools/cmdutils.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
> index e442935cae..5c8d09f87a 100644
> --- a/fftools/cmdutils.c
> +++ b/fftools/cmdutils.c
> @@ -1471,9 +1471,13 @@ 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 NULL;
> +    }
>      return new_elem;

teh return NULL is not needed as av_freep sets new_elem to NULL

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who would give up essential Liberty, to purchase a little
temporary Safety, deserve neither Liberty nor Safety -- Benjamin Franklin

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

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

[Jiasheng Jiang]

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 <jiashengjiangcool@gmail.com>
---
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".