diff options
| author | Emilian Peev <epeev@google.com> | 2018-05-11 09:53:13 +0100 |
|---|---|---|
| committer | Tim Schumacher <timschumi@gmx.de> | 2018-07-16 21:01:21 +0200 |
| commit | de9bc5de2297b636c3841f981ae07e61840a55c9 (patch) | |
| tree | fffae2a1594b5f43bead8163cc86e27c31c7972d | |
| parent | 4683e985ad9c01d79f65d97fb0c9c95fbd1b9028 (diff) | |
| download | android_system_media-de9bc5de2297b636c3841f981ae07e61840a55c9.tar.gz android_system_media-de9bc5de2297b636c3841f981ae07e61840a55c9.tar.bz2 android_system_media-de9bc5de2297b636c3841f981ae07e61840a55c9.zip | |
Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004cm-13.0
* commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57':
Camera: Initialize metadata padding field
Test: Camera CTS
Bug: 77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f
(cherry picked from commit 6837fddebdc0ee6afe15517a620f754d88a3da42)
| -rw-r--r-- | camera/src/camera_metadata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c index eb0c6c40..46795e3f 100644 --- a/camera/src/camera_metadata.c +++ b/camera/src/camera_metadata.c @@ -189,7 +189,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; @@ -206,7 +206,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); |