Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4447be4 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Android (Google) Code Review
Browse files

Merge "Validate request metadata before coverting to camera metadata"

parents 61ac390b 2f6f874e

camera/device/3.2/default/convert.cpp

+8 −0
Original line number Diff line number Diff line
@@ -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 @@ bool convertFromHidl(const CameraMetadata &src, const camera_metadata_t** dst) { 
        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;

}