Fix false positive memory leak warning.

place_camera_metadata could return NULL only if buffer is NULL.

BUG: 27099839
Change-Id: I1f5c6c0b96e21d1b487a3c3bb0b550760d7ea5c6

diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c
index 1d9a9eb..d721552 100644 (file)
--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -199,9 +199,15 @@ 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);
-    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,