commit 3d816e19238194a836634c60cc3bd250a29afb39
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 18 17:58:56 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 18 17:58:56 2018 +0000
tree 0863f2822d5036b1034b75bccf35f2b7be44edd5
parent 9d05a1150cc26d1e2c3297012f712cbe8fe25241
parent 3098ae5665976c97fe20136183cb9465053e66ff

Merge "Make a logically const pointer const."

media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
index 8d5d071..75ca846 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
@@ -107,6 +107,7 @@
 #else
         if ((size_t)nLayers > SIZE_MAX / sizeof(Vol *)) {
             status = PV_FALSE;
+            oscl_free(video);
             goto fail;
         }
 
@@ -115,7 +116,8 @@
         if (video->vol == NULL) status = PV_FALSE;
         video->memoryUsage += nLayers * sizeof(Vol *);
 
-
+        /* be sure not to leak any previous state */
+        PVCleanUpVideoDecoder(decCtrl);
         /* we need to setup this pointer for the application to */
         /*    pass it around.                                   */
         decCtrl->videoDecoderData = (void *) video;