commit d8b5528a477aeb68f791217de6177ab08e3dcabf
author Greg Kaiser <gkaiser@google.com> Thu Mar 07 12:08:54 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Mar 07 12:08:54 2019 -0800
tree 60fcea3365a535fd49fc2d8c074fb5d227b90541
parent b70eff200b878224e76ee36e94eb0492c59d03d7
parent 4ccd50fc802621a2669cd857c90542215d670f27

Merge "m4v_h263_enc_test: Fix leaks in error cases" am: bd88535d65 am: dfe305a92b
am: 4ccd50fc80

Change-Id: Id618ea723198c1bdcee6f1872d6b8a88ec544896

media/libstagefright/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp b/media/libstagefright/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp
index db2c61a..5554ebd 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp
@@ -183,6 +183,10 @@
     // Initialize the encoder.
     if (!PVInitVideoEncoder(&handle, &encParams)) {
         fprintf(stderr, "Failed to initialize the encoder\n");
+        fclose(fpInput);
+        fclose(fpOutput);
+        free(inputBuf);
+        free(outputBuf);
         return EXIT_FAILURE;
     }
 
@@ -190,6 +194,10 @@
     int32_t headerLength = kOutputBufferSize;
     if (!PVGetVolHeader(&handle, outputBuf, &headerLength, 0)) {
         fprintf(stderr, "Failed to get VOL header\n");
+        fclose(fpInput);
+        fclose(fpOutput);
+        free(inputBuf);
+        free(outputBuf);
         return EXIT_FAILURE;
     }
     fwrite(outputBuf, 1, headerLength, fpOutput);