diff options
| author | Jasmine Chen <lnishan@google.com> | 2021-02-25 21:57:31 +0800 |
|---|---|---|
| committer | Jasmine Chen <lnishan@google.com> | 2021-02-26 17:23:38 +0800 |
| commit | 682abf403969efcbc8072a26f687560ad9def69a (patch) | |
| tree | f160b179335d9bda25f3bad4f9808ef0f931f62e /camera/common/1.0/default/CameraModule.cpp | |
| parent | 688c884605189b6b3184f4dc85bfb2b74306366d (diff) | |
Camera: Fix double-free in removeCamera
When a camera is removed, |hidlMetadata| takes over ownership of
|metadata|. Therefore, we should not free |metadata| again.
Bug: 180014486
Test: Remove an external camera, and no crashes were observed.
Change-Id: I85246067f8753911cbcb58af24a46f12962226f3
(cherry picked from commit f36a439e3a97315a9f0a8661ea77aff61fb79c82)
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
| -rw-r--r-- | camera/common/1.0/default/CameraModule.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 27e74f1480..16fb85cc64 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp @@ -549,7 +549,6 @@ void CameraModule::removeCamera(int cameraId) { } } } - free_camera_metadata(metadata); } mCameraInfoMap.removeItem(cameraId); |