Changeset 4306

Timestamp:

Dec 12, 2012 6:20:28 AM (12 years ago)

Author:

ming

Message:

Fixed #1598: Assertion when sip error code is not set (thanks Peter Koletzki for the report)

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_call.c (modified) (1 diff)
• pjsua_media.c (modified) (1 diff)

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

@@ -1030 +1030 @@
     pjsua_call *call;
     int call_id = -1;
-    int sip_err_code;
+    int sip_err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
     pjmedia_sdp_session *offer=NULL;
     pj_status_t status;

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

@@ -1516 +1516 @@
      */
 
-    if (pjsua_get_state() != PJSUA_STATE_RUNNING)
+    if (pjsua_get_state() != PJSUA_STATE_RUNNING) {
+        if (sip_err_code) *sip_err_code = PJSIP_SC_SERVICE_UNAVAILABLE;
         return PJ_EBUSY;
+    }
 
     if (async) {