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

Commit 7b46865a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: fix use after free in sensor timestamp" into rvc-dev am: 0fa486f5 am: 94d1d81a 

Change-Id: I88522f7cb71c24635e11ab2ac73aacae93bdc659
parents da2a2dde 94d1d81a

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

+3 −1
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ void sendCaptureResult( 
                frameNumber);

        return;

    }

    nsecs_t sensorTimestamp = timestamp.data.i64[0];



    for (auto& physicalMetadata : captureResult.mPhysicalMetadatas) {

        camera_metadata_entry timestamp =

                physicalMetadata.mPhysicalCameraMetadata.find(ANDROID_SENSOR_TIMESTAMP);
@@ -337,7 +339,7 @@ void sendCaptureResult( 
                CameraMetadata(m.mPhysicalCameraMetadata));

    }

    states.tagMonitor.monitorMetadata(TagMonitor::RESULT,

            frameNumber, timestamp.data.i64[0], captureResult.mMetadata,

            frameNumber, sensorTimestamp, captureResult.mMetadata,

            monitoredPhysicalMetadata);



    insertResultLocked(states, &captureResult, frameNumber);