am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"

* commit '44237a8d58dc218257687f2cbe8fd33d73a713e8':
  avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function

2 files changed, 5 insertions, 2 deletions

diff --git a/media/libstagefright/codecs/avc/common/include/avcapi_common.h b/media/libstagefright/codecs/avc/common/include/avcapi_common.h
index 001c1a1..abffe6e 100644
--- a/media/libstagefright/codecs/avc/common/include/avcapi_common.h
+++ b/media/libstagefright/codecs/avc/common/include/avcapi_common.h
@@ -213,7 +213,7 @@ typedef void (*FuctionType_FrameUnbind)(void *userData, int);
     memory usage.
 \param "size" "Size of requested memory in bytes."
 \param "attribute" "Some value specifying types, priority, etc. of the memory."
-\return "The address of the allocated memory"
+\return "The address of the allocated, zero-initialized memory"
 */
 typedef void* (*FunctionType_Malloc)(void *userData, int32 size, int attribute);
 
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
index b6cd6bb..a2ef3a1 100644
--- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
+++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
@@ -137,7 +137,10 @@ inline static void ConvertYUV420SemiPlanarToYUV420Planar(
 
 static void* MallocWrapper(
         void *userData, int32_t size, int32_t attrs) {
-    return malloc(size);
+    void *ptr = malloc(size);
+    if (ptr)
+        memset(ptr, 0, size);
+    return ptr;
 }
 
 static void FreeWrapper(void *userData, void* ptr) {