Changeset 3882

Timestamp:

Nov 2, 2011 8:48:06 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1415: Handle potential crash if joining worker thread fails in pjsua_destroy()

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1292 +1292 @@
     int i;  /* Must be signed */
 
+    PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags));
+
     /* Signal threads to quit: */
     pjsua_var.thread_quit_flag = 1;
@@ -1298 +1300 @@
     for (i=0; i<(int)pjsua_var.ua_cfg.thread_cnt; ++i) {
         if (pjsua_var.thread[i]) {
-            pj_thread_join(pjsua_var.thread[i]);
+            pj_status_t status;
+            status = pj_thread_join(pjsua_var.thread[i]);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(4,(THIS_FILE, status, "Error joining worker thread"));
+                pj_thread_sleep(1000);
+            }
             pj_thread_destroy(pjsua_var.thread[i]);
             pjsua_var.thread[i] = NULL;
@@ -1306 +1313 @@
     if (pjsua_var.endpt) {
         unsigned max_wait;
-
-        PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags));
 
         /* Terminate all calls. */