commit fd9dfb331cd7744ec77cfc1ce76b944877de0914
author Lorenzo Colitti <lorenzo@google.com> Wed Jan 18 00:45:24 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 18 00:45:24 2023 +0000
tree d77559c502f590d9ee25f8a39a23552527ecd35c
parent 0a10abdaf68a400c539dd43dbf315e0650eb9d03
parent 2d2531d76bf44bbcb5f8081c4e5fb64eb92adcf9

Merge "Convert Tetheroffload HIDL to AIDL." am: 7306073719 am: 2d2531d76b

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

Change-Id: I1f06c50c8ea77005da86637cf555c2242ceea07b
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;
 }