commit 7b7ca65bfc15b1dc47a0f1063b66d0e85fba849b
author Jim Bankoski <jimbankoski@google.com> Tue Sep 11 16:30:19 2012 -0700
committer Jim Bankoski <jimbankoski@google.com> Tue Sep 11 16:34:36 2012 -0700
tree 828a05e9e5ffa6bb0ce61bea9a60ef5252c58f7f
parent 2ff6d35064919a8ad9e56150a19dc7ccd3ec2e7e

fix valgrind mem leak on garbage decode

Multiple decoders were getting allocated per frame.
If the decoder crashed we exitted with out freeing
them and the next time in we'd allocate over.

This fix removes the allocation and just has 8
boolcoders in the pbi structure

Change-Id: I638b5bda23b622b43b7992aec21dd7cf6f6278da

vp8/decoder/decodframe.c

diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 1a462a2..ea8798f 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -831,9 +831,7 @@
     num_token_partitions = 1 << pbi->common.multi_token_partition;
     if (num_token_partitions > 1)
     {
-        CHECK_MEM_ERROR(pbi->mbc, vpx_malloc(num_token_partitions *
-                                             sizeof(vp8_reader)));
-        bool_decoder = pbi->mbc;
+        bool_decoder = &pbi->mbc[0];
     }
 
     /* Check for partitions within the fragments and unpack the fragments
@@ -907,16 +905,6 @@
 #endif
 }
 
-static void stop_token_decoder(VP8D_COMP *pbi)
-{
-    VP8_COMMON *pc = &pbi->common;
-
-    if (pc->multi_token_partition != ONE_PARTITION)
-    {
-        vpx_free(pbi->mbc);
-        pbi->mbc = NULL;
-    }
-}
 
 static void init_frame(VP8D_COMP *pbi)
 {
@@ -1441,8 +1429,6 @@
         corrupt_tokens |= xd->corrupted;
     }
 
-    stop_token_decoder(pbi);
-
     /* Collect information about decoder corruption. */
     /* 1. Check first boolean decoder for errors. */
     pc->yv12_fb[pc->new_fb_idx].corrupted = vp8dx_bool_error(bc);

vp8/decoder/onyxd_if.c

diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c
index 205c150..95293f4 100644
--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -120,7 +120,6 @@
     vp8_de_alloc_overlap_lists(pbi);
 #endif
     vp8_remove_common(&pbi->common);
-    vpx_free(pbi->mbc);
     vpx_free(pbi);
 }
 

vp8/decoder/onyxd_int.h

diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h
index 240f5f7..e6c814a 100644
--- a/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@ -77,7 +77,7 @@
     /* end of threading data */
 #endif
 
-    vp8_reader *mbc;
+    vp8_reader mbc[8];
     int64_t last_time_stamp;
     int   ready_for_new_data;