Changeset 2936 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Oct 10, 2009 1:36:43 PM (15 years ago)

Author:

bennylp

Message:

Ticket #965: Receiving (malformed) re-INVITE with the same Via branch parameter value as previous INVITE would raise assertion (thanks Daniel Nanassy for the report)

• also fix possible crashes when UAS transaction initialization fails for some reason

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -1533 +1533 @@
     {
         status = pjsip_tsx_create_uas(dlg->ua, rdata, &tsx);
-        PJ_ASSERT_ON_FAIL(status==PJ_SUCCESS,{goto on_return;});
+        if (status != PJ_SUCCESS) {
+            /* Once case for this is when re-INVITE contains same
+             * Via branch value as previous INVITE (ticket #965).
+             */
+            char errmsg[PJ_ERR_MSG_SIZE];
+            pj_str_t reason;
+
+            reason = pj_strerror(status, errmsg, sizeof(errmsg));
+            pjsip_endpt_respond_stateless(dlg->endpt, rdata, 500, &reason,
+                                          NULL, NULL);
+            goto on_return;
+        }
 
         /* Put this dialog in the transaction data. */