Changeset 4160 for pjproject

Timestamp:

Jun 7, 2012 4:10:22 AM (12 years ago)

Author:

nanang

Message:

Fix #1531: fixed memory and handle leak issue in clock thread.

File:

• pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c

@@ -166 +166 @@
                      p_clock, PJ_EINVAL);
 
-    pool = pj_pool_create(pool->factory, "clock%p", 512, 512, NULL);
-
     clock = PJ_POOL_ALLOC_T(pool, pjmedia_clock);
-    clock->pool = pool;
-    
+    clock->pool = pj_pool_create(pool->factory, "clock%p", 512, 512, NULL);
+
     status = pj_get_timestamp_freq(&clock->freq);
     if (status != PJ_SUCCESS)
@@ -226 +224 @@
                                   0, 0, &clock->thread);
         if (status != PJ_SUCCESS) {
-            pj_lock_destroy(clock->lock);
+            clock->running = PJ_FALSE;
             return status;
         }
@@ -247 +245 @@
     if (clock->thread) {
         if (pj_thread_join(clock->thread) == PJ_SUCCESS) {
+            pj_thread_destroy(clock->thread);
             clock->thread = NULL;
+            pj_pool_reset(clock->pool);
         } else {
             clock->quitting = PJ_FALSE;