[FFmpeg-devel] [PATCH] examples: Replace with proper error handling to avoid potential memory errors

[Jiasheng Jiang]

Add check for the return valud of av_packet_alloc() to avoid potential NULL 
pointer dereference.
Moreover, replace with proper error handling to avoid potential memory leak.

Fixes: 9a38184a14 ("examples/decode_audio: allocate the packet dynamically")
Fixes: f5df897c4b ("examples/avcodec: split audio decoding into a separate 
example")
Signed-off-by: Jiasheng Jiang <jiashengjiangc...@gmail.com>
---
 doc/examples/decode_audio.c | 39 +++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/doc/examples/decode_audio.c b/doc/examples/decode_audio.c
index bcb3d87a69..7d9093c0e9 100644
--- a/doc/examples/decode_audio.c
+++ b/doc/examples/decode_audio.c
@@ -128,41 +128,48 @@ int main(int argc, char **argv)
     outfilename = argv[2];
 
     pkt = av_packet_alloc();
+    if (!pkt)
+        exit(1);
 
     /* find the MPEG audio decoder */
     codec = avcodec_find_decoder(AV_CODEC_ID_MP2);
     if (!codec) {
         fprintf(stderr, "Codec not found\n");
-        exit(1);
+        ret = -1;
+        goto free_pkt;
     }
 
     parser = av_parser_init(codec->id);
     if (!parser) {
         fprintf(stderr, "Parser not found\n");
-        exit(1);
+        ret = -1;
+        goto free_pkt;
     }
 
     c = avcodec_alloc_context3(codec);
     if (!c) {
         fprintf(stderr, "Could not allocate audio codec context\n");
-        exit(1);
+        ret = -1;
+        goto close_parser;
     }
 
     /* open it */
     if (avcodec_open2(c, codec, NULL) < 0) {
         fprintf(stderr, "Could not open codec\n");
-        exit(1);
+        ret = -1;
+        goto free_context;
     }
 
     f = fopen(filename, "rb");
     if (!f) {
         fprintf(stderr, "Could not open %s\n", filename);
-        exit(1);
+        ret = -1;
+        goto free_context;
     }
     outfile = fopen(outfilename, "wb");
     if (!outfile) {
-        av_free(c);
-        exit(1);
+        ret = -1;
+        goto fclose_f;
     }
 
     /* decode until eof */
@@ -173,7 +180,8 @@ int main(int argc, char **argv)
         if (!decoded_frame) {
             if (!(decoded_frame = av_frame_alloc())) {
                 fprintf(stderr, "Could not allocate audio frame\n");
-                exit(1);
+                ret = -1;
+                goto fclose_outfile;
             }
         }
 
@@ -182,7 +190,7 @@ int main(int argc, char **argv)
                                AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0);
         if (ret < 0) {
             fprintf(stderr, "Error while parsing\n");
-            exit(1);
+            goto end;
         }
         data      += ret;
         data_size -= ret;
@@ -225,13 +233,20 @@ int main(int argc, char **argv)
            fmt, n_channels, c->sample_rate,
            outfilename);
 end:
+    av_frame_free(&decoded_frame);
+fclose_outfile:
     fclose(outfile);
+fclose_f:
     fclose(f);
-
+free_context:
     avcodec_free_context(&c);
+close_parser:
     av_parser_close(parser);
-    av_frame_free(&decoded_frame);
+free_pkt:
     av_packet_free(&pkt);
 
+    if (ret < 0)
+        exit(1);
+
     return 0;
-}
+}
\ No newline at end of file
-- 
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-requ...@ffmpeg.org with subject "unsubscribe".