Fix crash issue

- problem: Crash takes place when doing adding a device and detection
  simultaneously.
- Cause: timer callback tries to remove freed memory.
- Solution: Remove timer when removing an async request.

Change-Id: I24be2a3c53ee18e8f3c97be46348a05b03a0782d
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/packaging/ua-manager.spec b/packaging/ua-manager.spec
index 06b1e09..21bc4aa 100644 (file)
--- a/packaging/ua-manager.spec
+++ b/packaging/ua-manager.spec
@@ -1,6 +1,6 @@
 Name:       ua-manager
 Summary:    User awareness manager
-Version:    0.13.15
+Version:    0.13.16
 Release:    1
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/ua-daemon/src/ua-manager-request-handler.c b/ua-daemon/src/ua-manager-request-handler.c
index 0b08f12..7afa318 100644 (file)
--- a/ua-daemon/src/ua-manager-request-handler.c
+++ b/ua-daemon/src/ua-manager-request-handler.c
@@ -1163,6 +1163,7 @@ void _uam_manager_remove_req_ctxt_from_list(uam_request_context_t *req_info)
                }
 
                if (NULL == info->sender) {
+                       _uam_remove_timer(info->tid);
                        g_free(info->data);
                        g_free(info);
                        request_list = g_slist_remove_link(request_list, l);
@@ -1172,7 +1173,7 @@ void _uam_manager_remove_req_ctxt_from_list(uam_request_context_t *req_info)
 
                if ((strcasecmp(info->sender, req_info->sender) == 0) &&
                        req_info->function == info->function) {
-
+                       _uam_remove_timer(info->tid);
                        g_free(info->sender);
                        g_free(info->data);
                        g_free(info);