commit ba1a53006f0f311c3dc47d659d2ab024c9bc87b8
author George Burgess IV <gbiv@google.com> Fri Nov 01 16:39:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 16:39:18 2019 -0700
tree 94579112746a7d9e7ff90a8ba59f7a97509c0898
parent dfbaa6852952e988816a6d5c7a54bfe596940806
parent bf432cced92d7005427363041b244dc02369579d

Merge "camera: fix two potential null pointer uses"
am: bf432cced9

Change-Id: I25af16883f8b3e8e323e384a68509031c1bcf720

camera/device/1.0/default/CameraDevice.cpp

diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp
index a03bbc8..2dd6094 100644
--- a/camera/device/1.0/default/CameraDevice.cpp
+++ b/camera/device/1.0/default/CameraDevice.cpp
@@ -397,9 +397,11 @@
     CameraDevice* device = mem->handle.mDevice;
     if (device == nullptr) {
         ALOGE("%s: camera HAL return memory for a null device!", __FUNCTION__);
+        return;
     }
     if (device->mDeviceCallback == nullptr) {
         ALOGE("%s: camera HAL return memory while camera is not opened!", __FUNCTION__);
+        return;
     }
     device->mDeviceCallback->unregisterMemory(mem->handle.mId);
     {