commit 909f1abd1107d405ffc67f36766b230c710794d0
author android-build-team Robot <android-build-team-robot@google.com> Sun May 13 07:26:30 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun May 13 07:26:30 2018 +0000
tree 53d778330841b33d0c31392e629d803fa00df5f7
parent 9e76c300dfea89a81cb48dad0ed8c7be43a70c0d
parent e5a5cfb39fd8afefcca9c51a6728aa0d3637a1ae

Snap for 4778776 from e5a5cfb39fd8afefcca9c51a6728aa0d3637a1ae to pi-release

Change-Id: I95bd0d43d65ff81d0d178dd865e890db797a6581

camera/src/camera_metadata.c

diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c
index e99abc4..f33da8d 100644
--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -234,7 +234,7 @@
         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 @@
 
     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) {