| commit | e1ac0f101c5711cffafe9dd83c2b324323cebf45 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jan 20 03:12:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 20 03:12:43 2023 +0000 |
| tree | 8e4bfbdc39376970912c365c9a156500d7eb1e3e | |
| parent | 230268c922da2ce6ae6c903aa0b73dbb01e4bf93 [diff] | |
| parent | 55aed9749d7c5c48923ff0fc70bfab693a0f9a23 [diff] |
Merge changes Ie7e60128,I1a648227 am: 115b1a7dae am: 55aed9749d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2395913 Change-Id: Ia52679347ccd01e5d193337a43fff4d2daca9db0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; }