Changeset 130

Timestamp:

Feb 2, 2006 9:14:29 PM (18 years ago)

Author:

bennylp

Message:

Added more asserts

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -975 +975 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(tdata!=NULL && p_tsx!=NULL, PJ_EINVAL);
+    /* Validate arguments. */
+    PJ_ASSERT_RETURN(tdata && tdata->msg && p_tsx, PJ_EINVAL);
+    PJ_ASSERT_RETURN(tdata->msg->type == PJSIP_REQUEST_MSG,
+                     PJSIP_ENOTREQUESTMSG);
+
+    /* Method MUST NOT be ACK! */
+    PJ_ASSERT_RETURN(tdata->msg->line.req.method.id != PJSIP_ACK_METHOD,
+                     PJ_EINVALIDOP);
 
     /* Keep shortcut */
@@ -1098 +1105 @@
     struct tsx_lock_data lck;
 
-    PJ_ASSERT_RETURN(rdata!=NULL && p_tsx!=NULL, PJ_EINVAL);
+    /* Validate arguments. */
+    PJ_ASSERT_RETURN(rdata && rdata->msg_info.msg && p_tsx, PJ_EINVAL);
 
     /* Keep shortcut to message */
@@ -1105 +1113 @@
     /* Make sure this is a request message. */
     PJ_ASSERT_RETURN(msg->type == PJSIP_REQUEST_MSG, PJSIP_ENOTREQUESTMSG);
+
+    /* Make sure method is not ACK */
+    PJ_ASSERT_RETURN(msg->line.req.method.id != PJSIP_ACK_METHOD,
+                     PJ_EINVALIDOP);
 
     /* Make sure CSeq header is present. */