summaryrefslogtreecommitdiff
path: root/src/cam
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-08-18 03:24:56 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-08-19 19:07:45 +0300
commit53704ac3f406a776cfe636c45fd7fdd305962788 (patch)
treed097fbf758624f2ae23940f9156845ddc43bc749 /src/cam
parent3e4672f159791c6334ee943c67a3273161256bcd (diff)
libcamera: camera_manager: Construct CameraManager instances manually
The CameraManager class is not supposed to be instantiated multiple times, which led to a singleton implementation. This requires a global instance of the CameraManager, which is destroyed when the global destructors are executed. Relying on global instances causes issues with cleanup, as the order in which the global destructors are run can't be controlled. In particular, the Android camera HAL implementation ends up destroying the CameraHalManager after the CameraManager, which leads to use-after-free problems. To solve this, remove the CameraManager::instance() method and make the CameraManager class instantiable directly. Multiple instances are still not allowed, and this is enforced by storing the instance pointer internally to be checked when an instance is created. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/cam')
-rw-r--r--src/cam/main.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/cam/main.cpp b/src/cam/main.cpp
index 77bb20e9..9d99f558 100644
--- a/src/cam/main.cpp
+++ b/src/cam/main.cpp
@@ -23,6 +23,7 @@ class CamApp
{
public:
CamApp();
+ ~CamApp();
static CamApp *instance();
@@ -54,6 +55,11 @@ CamApp::CamApp()
CamApp::app_ = this;
}
+CamApp::~CamApp()
+{
+ delete cm_;
+}
+
CamApp *CamApp::instance()
{
return CamApp::app_;
@@ -67,7 +73,7 @@ int CamApp::init(int argc, char **argv)
if (ret < 0)
return ret;
- cm_ = CameraManager::instance();
+ cm_ = new CameraManager();
ret = cm_->start();
if (ret) {