[FFmpeg-devel] [PATCH 1/2] doc/examples/transcode_aac: free the converted input samples buffer with av_free

[FFmpeg-devel] [PATCH 1/2] doc/examples/transcode_aac: free the converted input samples buffer with av_free

[James Almer]

Fixes -Wuse-after-free warnings.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 doc/examples/transcode_aac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c
index bb5681a7c0..7f4ca382b1 100644
--- a/doc/examples/transcode_aac.c
+++ b/doc/examples/transcode_aac.c
@@ -465,7 +465,7 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
         fprintf(stderr,
                 "Could not allocate converted input samples (error '%s')\n",
                 av_err2str(error));
-        av_freep(&(*converted_input_samples)[0]);
+        av_free((*converted_input_samples)[0]);
         free(*converted_input_samples);
         return error;
     }
@@ -599,7 +599,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
 
 cleanup:
     if (converted_input_samples) {
-        av_freep(&converted_input_samples[0]);
+        av_free(converted_input_samples[0]);
         free(converted_input_samples);
     }
     av_frame_free(&input_frame);
-- 
2.40.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".

[FFmpeg-devel] [PATCH 2/2] doc/examples/transcode_aac: use av_calloc to allocate the array of input samples buffer pointers

[James Almer]

Signed-off-by: James Almer <jamrial@gmail.com>
---
 doc/examples/transcode_aac.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c
index 7f4ca382b1..eddb3b203d 100644
--- a/doc/examples/transcode_aac.c
+++ b/doc/examples/transcode_aac.c
@@ -450,8 +450,8 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
      * Each pointer will later point to the audio samples of the corresponding
      * channels (although it may be NULL for interleaved formats).
      */
-    if (!(*converted_input_samples = calloc(output_codec_context->ch_layout.nb_channels,
-                                            sizeof(**converted_input_samples)))) {
+    if (!(*converted_input_samples = av_calloc(output_codec_context->ch_layout.nb_channels,
+                                               sizeof(**converted_input_samples)))) {
         fprintf(stderr, "Could not allocate converted input sample pointers\n");
         return AVERROR(ENOMEM);
     }
@@ -465,8 +465,9 @@ static int init_converted_samples(uint8_t ***converted_input_samples,
         fprintf(stderr,
                 "Could not allocate converted input samples (error '%s')\n",
                 av_err2str(error));
+
         av_free((*converted_input_samples)[0]);
-        free(*converted_input_samples);
+        av_freep(converted_input_samples);
         return error;
     }
     return 0;
@@ -600,7 +601,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo,
 cleanup:
     if (converted_input_samples) {
         av_free(converted_input_samples[0]);
-        free(converted_input_samples);
+        av_free(converted_input_samples);
     }
     av_frame_free(&input_frame);
 
-- 
2.40.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".