Changeset 4861

Timestamp:

Jun 19, 2014 8:06:50 AM (10 years ago)

Author:

nanang

Message:

Close #1772: Fixed error handling in pjsua_create() and pjsua_init().

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -798 +798 @@
     /* Init PJLIB-UTIL: */
     status = pjlib_util_init();
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_log_pop_indent();
+        pjsua_perror(THIS_FILE, "Failed in initializing pjlib-util", status);
+        pj_shutdown();
+        return status;
+    }
 
     /* Init PJNATH */
     status = pjnath_init();
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_log_pop_indent();
+        pjsua_perror(THIS_FILE, "Failed in initializing pjnath", status);
+        pj_shutdown();
+        return status;
+    }
 
     /* Set default sound device ID */
@@ -817 +827 @@
     /* Create memory pool for application. */
     pjsua_var.pool = pjsua_pool_create("pjsua", 1000, 1000);
+    if (pjsua_var.pool == NULL) {
+        pj_log_pop_indent();
+        status = PJ_ENOMEM;
+        pjsua_perror(THIS_FILE, "Unable to create pjsua pool", status);
+        pj_shutdown();
+        return status;
+    }
     
-    PJ_ASSERT_RETURN(pjsua_var.pool, PJ_ENOMEM);
-
     /* Create mutex */
     status = pj_mutex_create_recursive(pjsua_var.pool, "pjsua", 
@@ -826 +841 @@
         pj_log_pop_indent();
         pjsua_perror(THIS_FILE, "Unable to create mutex", status);
+        pjsua_destroy();
         return status;
     }
@@ -835 +851 @@
                                 pj_gethostname()->ptr, 
                                 &pjsua_var.endpt);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    if (status != PJ_SUCCESS) {
+        pj_log_pop_indent();
+        pjsua_perror(THIS_FILE, "Unable to create endpoint", status);
+        pjsua_destroy();
+        return status;
+    }
 
     /* Init timer entry list */
@@ -846 +867 @@
         pj_log_pop_indent();
         pjsua_perror(THIS_FILE, "Unable to create mutex", status);
+        pjsua_destroy();
         return status;
     }
@@ -1126 +1148 @@
 
 on_error:
-    pjsua_destroy();
     pj_log_pop_indent();
     return status;