commit 9f92886aa093c3af51484c28e92a66da7877188e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 18 22:41:25 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 18 22:41:25 2023 +0000
tree 53bb8c56b05aa20bad0c069f5f3dfb785f7dcf26
parent b6814c4ddbb1da843519a74f1d5980c1185dce7a
parent 7699a94412a1a50c0d7449a1d33f60efe1ead111

Merge "Add tetheroffload VTS to general-tests" am: f358c7be57 am: 7699a94412

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2393025

Change-Id: Ia33c5221ca1e8548f65beb7e64638f54e53df90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

camera/device/3.2/default/convert.cpp

diff --git a/camera/device/3.2/default/convert.cpp b/camera/device/3.2/default/convert.cpp
index 06ad7e9..2075607 100644
--- a/camera/device/3.2/default/convert.cpp
+++ b/camera/device/3.2/default/convert.cpp
@@ -16,6 +16,7 @@
 
 #define LOG_TAG "android.hardware.camera.device@3.2-convert-impl"
 #include <log/log.h>
+#include <system/camera_metadata.h>
 
 #include "include/convert.h"
 
@@ -43,6 +44,13 @@
         ALOGE("%s: input CameraMetadata is corrupt!", __FUNCTION__);
         return false;
     }
+
+    if (validate_camera_metadata_structure((camera_metadata_t*)data, /*expected_size=*/NULL) !=
+        OK) {
+        ALOGE("%s: Failed to validate the metadata structure", __FUNCTION__);
+        return false;
+    }
+
     *dst = (camera_metadata_t*) data;
     return true;
 }