Changeset 5937

Timestamp:

Feb 28, 2019 9:09:42 AM (6 years ago)

Author:

nanang

Message:

Re #2147: Added logging and explicit SIP error code for assertions in SIP message verification.

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -1182 +1182 @@
 
             /* Local SDP must be valid! */
-            PJ_ASSERT_RETURN((status=pjmedia_sdp_validate(l_sdp))==PJ_SUCCESS,
-                             status);
+            status = pjmedia_sdp_validate(l_sdp);
+            if (status != PJ_SUCCESS) {
+                pj_assert(!"Invalid local SDP");
+                code = PJSIP_SC_INTERNAL_SERVER_ERROR;
+                goto on_return;
+            }
 
             /* Create SDP negotiator */
             status = pjmedia_sdp_neg_create_w_remote_offer(
                             tmp_pool, l_sdp, r_sdp, &neg);
-            PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+            if (status != PJ_SUCCESS) {
+                pj_assert(!"Failed creating SDP negotiator");
+                code = PJSIP_SC_INTERNAL_SERVER_ERROR;
+                goto on_return;
+            }
 
             /* Negotiate SDP */

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

@@ -1241 +1241 @@
              * No we can't handle the incoming INVITE request.
              */
+            pjsua_perror(THIS_FILE, "Request verification failed", status);
+
             if (response)
                 err_code = (*response)->msg->line.status.code;