| commit | ecd3296f1eb58e250b46b28761b13f88dcb025f6 | [log] [tgz] |
|---|---|---|
| author | Jasmine Chen <lnishan@google.com> | Thu Feb 25 21:57:31 2021 +0800 |
| committer | Jayant Chowdhary <jchowdhary@google.com> | Tue Mar 02 21:06:15 2021 +0000 |
| tree | e552cb80d67735cfcc52a1abd3209d3fc9765893 | |
| parent | b2bb9879513e9e535a73cef1037818d5b27c153a [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. Marged-In: I85246067f8753911cbcb58af24a46f12962226f3 Change-Id: I85246067f8753911cbcb58af24a46f12962226f3 (cherry picked from commit f36a439e3a97315a9f0a8661ea77aff61fb79c82) (cherry picked from commit 682abf403969efcbc8072a26f687560ad9def69a)
diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 27e74f1..16fb85c 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp
@@ -549,7 +549,6 @@ } } } - free_camera_metadata(metadata); } mCameraInfoMap.removeItem(cameraId);