services: fix seg. fault issue

Fix seg. fault issue.

The issue happened because invokeThread() callback of AsyncManager class
was called after camera service had been terminated, which in turn,
the callback of branch node tried to access invalid buffer.

So this patch makes sure to wait for the completion of AsyncManager's thread
after the camera service is off.

Change-Id: Ic64f2fd88f880b2eab9ec26b58cc7252bfb16930
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/services/auto_zoom/src/AutoZoom.cpp b/services/auto_zoom/src/AutoZoom.cpp
index bf9a2f620ca89286f7452b567016c564d6ecef35..35ac12a3d95780e361627b6140dbc202d0d670d5 100644 (file)
--- a/services/auto_zoom/src/AutoZoom.cpp
+++ b/services/auto_zoom/src/AutoZoom.cpp
@@ -145,8 +145,10 @@ void AutoZoom::configure(InputConfigBase &config)
 
 AutoZoom::~AutoZoom()
 {
-       if (_async_mode)
+       if (_async_mode) {
                _input_service->streamOff();
+               _async_manager->destroy();
+       }
 
        _taskManager->clear();
 }

diff --git a/services/common/include/AsyncManager.h b/services/common/include/AsyncManager.h
index ee32192b244fe6dde4827b898cc108c641b09f58..329732355c802368da7452a9986ba1721aec0bc3 100644 (file)
--- a/services/common/include/AsyncManager.h
+++ b/services/common/include/AsyncManager.h
@@ -117,7 +117,9 @@ public:
                _thread_handle = std::make_unique<std::thread>(&AsyncManager::invokeThread, this);
        }
 
-       ~AsyncManager()
+       ~AsyncManager() = default;
+
+       void destroy()
        {
                _exit_thread = true;
                _thread_handle->join();