Merge the 2018-09-05 SPL branch from AOSP-Partner
* security-aosp-nyc-mr2-release:
Camera: Initialize metadata padding field
Change-Id: Ie96f68936e3e48a95dc625264b1dd587c172b7b7
diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c
index 357c685..99fe411 100644
--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -189,7 +189,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;
@@ -206,7 +206,7 @@
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);