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

Commit 298b8b09 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp am: cbbd7e06 

Change-Id: I21c4f1cad1f3860ab741825f4a635368667c3334
parents a0fff28d cbbd7e06

services/camera/libcameraservice/device3/Camera3Device.cpp

+3 −1
Original line number Diff line number Diff line
@@ -3529,6 +3529,8 @@ void Camera3Device::sendCaptureResult(CameraMetadata &pendingMetadata, 
                frameNumber);

        return;

    }

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



    for (auto& physicalMetadata : captureResult.mPhysicalMetadatas) {

        camera_metadata_entry timestamp =

                physicalMetadata.mPhysicalCameraMetadata.find(ANDROID_SENSOR_TIMESTAMP);
@@ -3583,7 +3585,7 @@ void Camera3Device::sendCaptureResult(CameraMetadata &pendingMetadata, 
                CameraMetadata(m.mPhysicalCameraMetadata));

    }

    mTagMonitor.monitorMetadata(TagMonitor::RESULT,

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

            frameNumber, sensorTimestamp, captureResult.mMetadata,

            monitoredPhysicalMetadata);



    insertResultLocked(&captureResult, frameNumber);