diff options
| author | George Burgess IV <gbiv@google.com> | 2019-11-01 13:31:25 -0700 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2020-11-27 11:49:07 +0100 |
| commit | be81ba7625420f84a2e311ef6a6b313a339588fb (patch) | |
| tree | 33abef9a903d21246e8b2ef92aeb1c4eb32056c2 | |
| parent | 8e8ac9b40e44b7c2411b68d36351b4d9e6abb142 (diff) | |
interfaces: 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
| -rw-r--r-- | camera/device/1.0-legacy/CameraDevice.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/device/1.0-legacy/CameraDevice.cpp b/camera/device/1.0-legacy/CameraDevice.cpp index 7140ee8..f324e45 100644 --- a/camera/device/1.0-legacy/CameraDevice.cpp +++ b/camera/device/1.0-legacy/CameraDevice.cpp @@ -399,9 +399,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); { |