commit 682abf403969efcbc8072a26f687560ad9def69a
author Jasmine Chen <lnishan@google.com> Thu Feb 25 21:57:31 2021 +0800
committer Jasmine Chen <lnishan@google.com> Fri Feb 26 17:23:38 2021 +0800
tree f160b179335d9bda25f3bad4f9808ef0f931f62e
parent 688c884605189b6b3184f4dc85bfb2b74306366d

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)

camera/common/1.0/default/CameraModule.cpp

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