commit db1b5a3f4824a72c49af33ff78d061531ffc2ddd
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 15 05:17:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 15 05:17:34 2018 +0000
tree 9b80a195529855e4f6653e9fb17fce0b95f0c6fd
parent cca99ce47f6d275bf768361117559acacebd0798
parent d4b8d2179f17a261b348b8a38cbc5278f8b4d45d

Merge "Camera: Fix a crash in removeCamera()"

camera/common/1.0/default/CameraModule.cpp

diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp
index 392ebbc..9c2b02b 100644
--- a/camera/common/1.0/default/CameraModule.cpp
+++ b/camera/common/1.0/default/CameraModule.cpp
@@ -466,8 +466,8 @@
 }
 
 void CameraModule::removeCamera(int cameraId) {
-    free_camera_metadata(
-        const_cast<camera_metadata_t*>(mCameraInfoMap[cameraId].static_camera_characteristics));
+    free_camera_metadata(const_cast<camera_metadata_t*>(
+        mCameraInfoMap.valueFor(cameraId).static_camera_characteristics));
     mCameraInfoMap.removeItem(cameraId);
     mDeviceVersionMap.removeItem(cameraId);
 }