commit c0d8c35a2d3873ef1d7c7e5c5eaa51f41c1c3a17
author Ian Pedowitz <ijpedowitz@google.com> Thu Oct 22 02:06:29 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 22 02:06:29 2015 +0000
tree bff1acf02687c2f90a847f9acc8ab99c683ca445
parent 301a55c1152949f6c06247a2044f98cd150fcfde
parent 5adc76c49a525993f3362cf648864fb21f4547f0

Merge "DO NOT MERGE: libcameraservice: Fix nullptr crash when no client." into mnc-dr-dev

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 2bb282f..3deb396 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -315,8 +315,10 @@
             clientToDisconnect = removeClientLocked(id);
 
             // Notify the client of disconnection
-            clientToDisconnect->notifyError(ICameraDeviceCallbacks::ERROR_CAMERA_DISCONNECTED,
-                    CaptureResultExtras{});
+            if (clientToDisconnect != nullptr) {
+                clientToDisconnect->notifyError(ICameraDeviceCallbacks::ERROR_CAMERA_DISCONNECTED,
+                        CaptureResultExtras{});
+            }
         }
 
         ALOGI("%s: Client for camera ID %s evicted due to device status change from HAL",