commit a5d9f769fa6649c8300761531352357d5e52b40f
author Andy Hung <hunga@google.com> Sat Jan 14 00:37:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 14 00:37:22 2023 +0000
tree a5523f5c71b83030efce126c1a317c80d8c0a7ba
parent c5f350958b18d33e497524905a0a7b6c1a7d7e49
parent d8a480d0c912803cc830d7ae8a5d984a3fcb6dbd

[automerger skipped] Merge "Effect: Move thread priority updates from threadLoop" am: 7d8406c75a am: d8a480d0c9 -s ours

am skip reason: Merged-In I31de38d54aa42d7ae3cc87d0afc4a410fc3336ad with SHA-1 cbde2d0940 is already in history

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

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