commit bd88535d657e1649dfcb1af9e11c752179f5423a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 07 17:41:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 07 17:41:26 2019 +0000
tree 66e644714e310f820433fe328b28bbba77203937
parent fb208d465903f7ffa504a196032bdd590ed22770
parent 50d2ce03c02d8d535967f50e0041a1fcacb21582

Merge "m4v_h263_enc_test: Fix leaks in error cases"

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);