diff options
| author | George Burgess IV <gbiv@google.com> | 2019-11-01 13:31:25 -0700 |
|---|---|---|
| committer | George Burgess IV <gbiv@google.com> | 2019-11-01 13:31:25 -0700 |
| commit | 2ea148804abbdbe4d3479413779484af86020a05 (patch) | |
| tree | 0b02a5f9bc68a6aafe8dacb733e4d878ba5efc33 /camera/device/1.0/default/CameraDevice.cpp | |
| parent | 51d32a6881c1b606e84f0d93e045026b555ebb92 (diff) | |
camera: fix two potential null pointer uses
Caught by the static analyzer:
hardware/interfaces/camera/device/1.0/default/CameraDevice.cpp:401:9:
warning: Called C++ object pointer is null
[clang-analyzer-core.CallAndMessage]
Bug: None
Test: TreeHugger
Change-Id: Ia6d0a2ab4b4d04cfc171629c7dbf60ead181625d
Diffstat (limited to 'camera/device/1.0/default/CameraDevice.cpp')
| -rw-r--r-- | camera/device/1.0/default/CameraDevice.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp index a03bbc8670..2dd6094a53 100644 --- a/camera/device/1.0/default/CameraDevice.cpp +++ b/camera/device/1.0/default/CameraDevice.cpp @@ -397,9 +397,11 @@ void CameraDevice::sPutMemory(camera_memory_t *data) { 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); { |