OSDN Git Service

Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539-474e...
authorEmilian Peev <epeev@google.com>
Fri, 11 May 2018 08:53:13 +0000 (09:53 +0100)
committerEmilian Peev <epeev@google.com>
Fri, 11 May 2018 08:54:27 +0000 (09:54 +0100)
* commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57':
  Camera: Initialize metadata padding field

Test: Camera CTS
Bug: 77238656
Change-Id: I6c8b3138a0e2176228180d7b1edc9f9352d0c07f

1  2 
camera/src/camera_metadata.c

@@@ -251,16 -205,10 +251,16 @@@ camera_metadata_t *allocate_camera_meta
  
      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);
 +    camera_metadata_t *metadata = place_camera_metadata(
 +        buffer, memory_needed, entry_capacity, data_capacity);
 +    if (!metadata) {
 +        /* This should not happen when memory_needed is the same
 +         * calculated in this function and in place_camera_metadata.
 +         */
 +        free(buffer);
 +    }
 +    return metadata;
  }
  
  camera_metadata_t *place_camera_metadata(void *dst,