Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

system-media: Commit

system/media


Commit MetaInfo

Revision256dd81fad17cf3826c1dcd22c4cd62bc6d11d8e (tree)
Time2018-08-04 04:18:40
AuthorEmilian Peev <epeev@goog...>
Commiterandroid-build-team Robot

Log Message

Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e-b9c8-36cc976d15e8

* commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57':

Camera: Initialize metadata padding field

Test: Camera CTS
Bug: 77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f
(cherry picked from commit 6837fddebdc0ee6afe15517a620f754d88a3da42)

Change Summary

Incremental Difference

--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -234,7 +234,7 @@ camera_metadata_t *allocate_copy_camera_metadata_checked(
234234 return NULL;
235235 }
236236
237- void *buffer = malloc(src_size);
237+ void *buffer = calloc(1, src_size);
238238 memcpy(buffer, src, src_size);
239239
240240 camera_metadata_t *metadata = (camera_metadata_t*) buffer;
@@ -251,7 +251,7 @@ camera_metadata_t *allocate_camera_metadata(size_t entry_capacity,
251251
252252 size_t memory_needed = calculate_camera_metadata_size(entry_capacity,
253253 data_capacity);
254- void *buffer = malloc(memory_needed);
254+ void *buffer = calloc(1, memory_needed);
255255 camera_metadata_t *metadata = place_camera_metadata(
256256 buffer, memory_needed, entry_capacity, data_capacity);
257257 if (!metadata) {
Show on old repository browser