diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-06 23:16:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-06 23:16:52 +0000 |
commit | 62d8c625b6876d66e1b7d44e555c3d81ba19a9be (patch) | |
tree | fba6259e11955c6cca1cc5050ece8b7359b9a1d2 | |
parent | 9c236660dda87b1947784c568a61022e290d1009 (diff) | |
parent | 41b3802130286448b82003e3118dae29815bafd8 (diff) | |
download | camera-62d8c625b6876d66e1b7d44e555c3d81ba19a9be.tar.gz |
Snap for 10270308 from 41b3802130286448b82003e3118dae29815bafd8 to udc-d1-release
Change-Id: I9ee6550f21ef35271cee63dab58d9ca6dadec219
-rw-r--r-- | common/hal/aidl_service/aidl_utils.cc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/common/hal/aidl_service/aidl_utils.cc b/common/hal/aidl_service/aidl_utils.cc index 6d5f201..332d1a1 100644 --- a/common/hal/aidl_service/aidl_utils.cc +++ b/common/hal/aidl_service/aidl_utils.cc @@ -728,6 +728,15 @@ status_t ConvertToHalMetadata( metadata = reinterpret_cast<const camera_metadata_t*>(request_settings.data()); + + size_t metadata_size = get_camera_metadata_size(metadata); + if (metadata_size != request_settings.size()) { + ALOGE( + "%s: Mismatch between camera metadata size (%zu) and request " + "setting size (%zu)", + __FUNCTION__, metadata_size, request_settings.size()); + return BAD_VALUE; + } } } else { // Read the settings from request metadata queue. @@ -751,6 +760,15 @@ status_t ConvertToHalMetadata( metadata = reinterpret_cast<const camera_metadata_t*>( metadata_queue_settings.data()); + + size_t metadata_size = get_camera_metadata_size(metadata); + if (metadata_size != message_queue_setting_size) { + ALOGE( + "%s: Mismatch between camera metadata size (%zu) and message " + "queue setting size (%u)", + __FUNCTION__, metadata_size, message_queue_setting_size); + return BAD_VALUE; + } } if (metadata == nullptr) { |