OSDN Git Service

Camera: Initialize metadata padding field
authorEmilian Peev <epeev@google.com>
Tue, 10 Apr 2018 12:11:43 +0000 (13:11 +0100)
committerhamzeh <hamzeh@google.com>
Thu, 17 May 2018 15:06:45 +0000 (08:06 -0700)
'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)

camera/src/camera_metadata.c

index f76c99e..70074c8 100644 (file)
@@ -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);