Fixed Thread-unsafe code in caqueueingthread.c

mutex should be destroyed after deleting data queue.

Change-Id: I191d9519da47421d0e296d02cedd6af5eb757bdd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16337
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>

diff --git a/resource/csdk/connectivity/src/caqueueingthread.c b/resource/csdk/connectivity/src/caqueueingthread.c
index 22ae5d8..d5a67dd 100644 (file)
--- a/resource/csdk/connectivity/src/caqueueingthread.c
+++ b/resource/csdk/connectivity/src/caqueueingthread.c
@@ -246,9 +246,8 @@ CAResult_t CAQueueingThreadDestroy(CAQueueingThread_t *thread)
 
     OIC_LOG(DEBUG, TAG, "thread destroy..");
 
-    oc_mutex_free(thread->threadMutex);
-    thread->threadMutex = NULL;
-    oc_cond_free(thread->threadCond);
+    // mutex lock
+    oc_mutex_lock(thread->threadMutex);
 
     // remove all remained list data.
     while (u_queue_get_size(thread->dataQueue) > 0)
@@ -275,6 +274,13 @@ CAResult_t CAQueueingThreadDestroy(CAQueueingThread_t *thread)
     u_queue_delete(thread->dataQueue);
     thread->dataQueue = NULL;
 
+    // mutex unlock
+    oc_mutex_unlock(thread->threadMutex);
+
+    oc_mutex_free(thread->threadMutex);
+    thread->threadMutex = NULL;
+    oc_cond_free(thread->threadCond);
+
     return CA_STATUS_OK;
 }