Merge "Camera: fix use after free in sensor timestamp" into rvc-dev

4 years ago · 0fa486f514
parent 95ec1b8ea4 c530c5973f
commit 0fa486f514
1 changed files with 3 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
@ -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);