From: Emilian Peev <epeev@google.com>
Date: Tue, 10 Apr 2018 12:11:43 +0000 (+0100)
Subject: Camera: Initialize metadata padding field
X-Git-Tag: android-x86-7.1-r3^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e42fd08ca12a3c7d4231f667f48c46b311c19c47;p=android-x86%2Fsystem-media.git

Camera: Initialize metadata padding field

'padding' field in internal camera metadata structure should be
initialized.

Bug: 77238656
Test: Camera CTS
Change-Id: I57919ec6d6834b5e830be7cbe871558a5da3f266
Merged-In: I57919ec6d6834b5e830be7cbe871558a5da3f266
(cherry picked from commit f85ced226300c5bb17124705a5931424474ded27)
---

diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c
index f76c99ec..70074c82 100644
--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -188,7 +188,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;
@@ -205,7 +205,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);
     return place_camera_metadata(buffer, memory_needed,
                                  entry_capacity,
                                  data_capacity);