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

Commit 7fd1af85 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it" 

* commit 'c36fbcdf':
  camera: check Intent entry count before reading it
parents cf79c7a5 c36fbcdf

services/camera/libcameraservice/api1/client2/Parameters.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -1826,6 +1826,9 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { 




    camera_metadata_entry_t intent =

    camera_metadata_entry_t intent =

            request->find(ANDROID_CONTROL_CAPTURE_INTENT);

            request->find(ANDROID_CONTROL_CAPTURE_INTENT);



    if (intent.count == 0) return BAD_VALUE;



    if (intent.data.u8[0] == ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE) {

    if (intent.data.u8[0] == ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE) {

        res = request->update(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,

        res = request->update(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,

                fastInfo.bestStillCaptureFpsRange, 2);

                fastInfo.bestStillCaptureFpsRange, 2);