From: Emilian Peev <epeev@google.com>
Date: Fri, 11 May 2018 08:53:13 +0000 (+0100)
Subject: Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e... 
X-Git-Tag: android-x86-8.1-r1^2
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fsystem-media.git;a=commitdiff_plain;h=256dd81fad17cf3826c1dcd22c4cd62bc6d11d8e

Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8

* commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57':
  Camera: Initialize metadata padding field

Test: Camera CTS
Bug: 77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f
(cherry picked from commit 6837fddebdc0ee6afe15517a620f754d88a3da42)
---

diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c
index e99abc4f..f33da8dc 100644
--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -234,7 +234,7 @@ camera_metadata_t *allocate_copy_camera_metadata_checked(
         return NULL;
     }
 
-    void *buffer = malloc(src_size);
+    void *buffer = calloc(1, src_size);
     memcpy(buffer, src, src_size);
 
     camera_metadata_t *metadata = (camera_metadata_t*) buffer;
@@ -251,7 +251,7 @@ camera_metadata_t *allocate_camera_metadata(size_t entry_capacity,
 
     size_t memory_needed = calculate_camera_metadata_size(entry_capacity,
                                                           data_capacity);
-    void *buffer = malloc(memory_needed);
+    void *buffer = calloc(1, memory_needed);
     camera_metadata_t *metadata = place_camera_metadata(
         buffer, memory_needed, entry_capacity, data_capacity);
     if (!metadata) {