Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
am: ba1a53006f

Change-Id: Idde46fe6aeb8e747db3f703783e70fedcec18da7
This commit is contained in:
George Burgess IV
2019-11-01 16:53:17 -07:00
committed by android-build-merger
parent aaa72ec044 ba1a53006f
commit 32a78e184a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camera/device/1.0/default/CameraDevice.cpp
View File

@@ -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);
{