shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vpxdec: avoid memory leaks under most conditions"

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -495,6 +495,7 @@

   vpx_codec_ctx_t decoder;

   char *fn = NULL;

   int i;

+  int ret = EXIT_FAILURE;

   uint8_t *buf = NULL;

   size_t bytes_in_buffer = 0, buffer_size = 0;

   FILE *infile;

@@ -723,7 +724,7 @@

                          dec_flags)) {

     fprintf(stderr, "Failed to initialize decoder: %s\n",

             vpx_codec_error(&decoder));

-    return EXIT_FAILURE;

+    goto fail2;

   }

   if (!quiet) fprintf(stderr, "%s\n", decoder.name);

@@ -733,7 +734,7 @@

       vpx_codec_control(&decoder, VP8_SET_POSTPROC, &vp8_pp_cfg)) {

     fprintf(stderr, "Failed to configure postproc: %s\n",

             vpx_codec_error(&decoder));

-    return EXIT_FAILURE;

+    goto fail;

   }

 #endif

@@ -752,7 +753,7 @@

                                              &ext_fb_list)) {

       fprintf(stderr, "Failed to configure external frame buffers: %s\n",

               vpx_codec_error(&decoder));

-      return EXIT_FAILURE;

+      goto fail;

     }

   }

@@ -861,7 +862,7 @@

                   "Scaling is disabled in this configuration. "

                   "To enable scaling, configure with --enable-libyuv\n",

                   vpx_codec_error(&decoder));

-          return EXIT_FAILURE;

+          goto fail;

 #endif

         }

       }

@@ -972,8 +973,11 @@

     fprintf(stderr, "\n");

   }

-  if (frames_corrupted)

+  if (frames_corrupted) {

     fprintf(stderr, "WARNING: %d frames corrupted.\n", frames_corrupted);

+  } else {

+    ret = EXIT_SUCCESS;

+  }

 fail:

@@ -980,9 +984,10 @@

   if (vpx_codec_destroy(&decoder)) {

     fprintf(stderr, "Failed to destroy decoder: %s\n",

             vpx_codec_error(&decoder));

-    return EXIT_FAILURE;

   }

+fail2:

+

   if (!noblit && single_file) {

     if (do_md5) {

       MD5Final(md5_digest, &md5_ctx);

@@ -1012,7 +1017,7 @@

   fclose(infile);

   free(argv);

-  return frames_corrupted ? EXIT_FAILURE : EXIT_SUCCESS;

+  return ret;

 }

 int main(int argc, const char **argv_) {

-- 

⑨