Changeset 2921 for pjproject/branches/adhocs/1.4.5

Timestamp:

Oct 1, 2009 12:07:04 PM (15 years ago)

Author:

bennylp

Message:

Ticket #961 (1.4.5 branch): Assertion upon receiving malformed SIP messages (thanks Andrey Kovalenko for the report)

• backported r2915

Location:

pjproject/branches/adhocs/1.4.5

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport.c (modified) (1 diff)
• tests/pjsua/scripts-sipp/uac-bad-ack.xml (copied) (copied from pjproject/trunk/tests/pjsua/scripts-sipp/uac-bad-ack.xml)

pjproject/branches/adhocs/1.4.5/pjsip/src/pjsip/sip_transaction.c

@@ -2841 +2841 @@
             /* Process incoming ACK request. */
 
+            /* Verify that this is an INVITE transaction */
+            if (tsx->method.id != PJSIP_INVITE_METHOD) {
+                PJ_LOG(2, (tsx->obj_name, 
+                           "Received illegal ACK for %.*s transaction",
+                           (int)tsx->method.name.slen,
+                           tsx->method.name.ptr));
+                return PJSIP_EINVALIDMETHOD;
+            }
+
             /* Cease retransmission. */
             if (tsx->retransmit_timer.id != 0) {

pjproject/branches/adhocs/1.4.5/pjsip/src/pjsip/sip_transport.c

@@ -1440 +1440 @@
                 rdata->msg_info.via->rport_param = rdata->pkt_info.src_port;
             }
+        } else {
+            /* Drop malformed responses */
+            if (rdata->msg_info.msg->line.status.code < 100 ||
+                rdata->msg_info.msg->line.status.code >= 700)
+            {
+                mgr->on_rx_msg(mgr->endpt, PJSIP_EINVALIDSTATUS, rdata);
+                goto finish_process_fragment;
+            }
         }