Changeset 4683

Timestamp:

Dec 5, 2013 7:21:24 AM (11 years ago)

Author:

bennylp

Message:

Re #1519: added some more NULL checking in SIP data types

Location:

pjproject/branches/projects/pjsua2/pjsip

Files:

• include/pjsua2/siptypes.hpp (modified) (4 diffs)
• src/pjsua2/siptypes.cpp (modified) (5 diffs)

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/siptypes.hpp

@@ -432 +432 @@
 public:
     /**
+     * Default constructor.
+     */
+    SipRxData();
+
+    /**
      * Construct from PJSIP's pjsip_rx_data
      */
@@ -467 +472 @@
     
 public:
+    /**
+     * Default constructor.
+     */
+    SipTxData();
+
     /**
      * Construct from PJSIP's pjsip_tx_data
@@ -495 +505 @@
     
 public:
+    /**
+     * Default constructor.
+     */
+    SipTransaction();
+
     /**
      * Construct from PJSIP's pjsip_transaction
@@ -625 +640 @@
 public:
     /**
+     * Default constructor.
+     */
+    SipEvent();
+
+    /**
      * Construct from PJSIP's pjsip_event
      */

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/siptypes.cpp

@@ -322 +322 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+SipRxData::SipRxData()
+: pjRxData(NULL)
+{
+}
+
 void SipRxData::fromPj(pjsip_rx_data &rdata)
 {
@@ -426 +431 @@
 
 ///////////////////////////////////////////////////////////////////////////////
+
+SipEvent::SipEvent()
+: type(PJSIP_EVENT_UNKNOWN), pjEvent(NULL)
+{
+}
 
 void SipEvent::fromPj(const pjsip_event &ev)
@@ -437 +447 @@
         body.tsxState.tsx.fromPj(*ev.body.tsx_state.tsx);
         if (body.tsxState.type == PJSIP_EVENT_TX_MSG) {
-            body.tsxState.src.tdata.fromPj(*ev.body.tsx_state.src.tdata);
+            if (ev.body.tsx_state.src.tdata)
+                body.tsxState.src.tdata.fromPj(*ev.body.tsx_state.src.tdata);
         } else if (body.tsxState.type == PJSIP_EVENT_RX_MSG) {
-            body.tsxState.src.rdata.fromPj(*ev.body.tsx_state.src.rdata);
+            if (ev.body.tsx_state.src.rdata)
+                body.tsxState.src.rdata.fromPj(*ev.body.tsx_state.src.rdata);
         } else if (body.tsxState.type == PJSIP_EVENT_TRANSPORT_ERROR) {
             body.tsxState.src.status = ev.body.tsx_state.src.status;
@@ -448 +460 @@
         }
     } else if (type == PJSIP_EVENT_TX_MSG) {
-        body.txMsg.tdata.fromPj(*ev.body.tx_msg.tdata);
+        if (ev.body.tx_msg.tdata)
+            body.txMsg.tdata.fromPj(*ev.body.tx_msg.tdata);
     } else if (type == PJSIP_EVENT_RX_MSG) {
-        body.rxMsg.rdata.fromPj(*ev.body.rx_msg.rdata);
+        if (ev.body.rx_msg.rdata)
+            body.rxMsg.rdata.fromPj(*ev.body.rx_msg.rdata);
     } else if (type == PJSIP_EVENT_TRANSPORT_ERROR) {
-        body.txError.tdata.fromPj(*ev.body.tx_error.tdata);
-        body.txError.tsx.fromPj(*ev.body.tx_error.tsx);
+        if (ev.body.tx_error.tdata)
+            body.txError.tdata.fromPj(*ev.body.tx_error.tdata);
+        if (ev.body.tx_error.tsx)
+            body.txError.tsx.fromPj(*ev.body.tx_error.tsx);
     } else if (type == PJSIP_EVENT_USER) {
         body.user.user1 = ev.body.user.user1;
+        body.user.user2 = ev.body.user.user2;
+        body.user.user3 = ev.body.user.user3;
+        body.user.user4 = ev.body.user.user4;
     }
     pjEvent = (void *)&ev;
+}
+
+SipTxData::SipTxData()
+: pjTxData(NULL)
+{
 }
 
@@ -470 +494 @@
     dstAddress  = straddr;
     pjTxData    = (void *)&tdata;
+}
+
+SipTransaction::SipTransaction()
+: role(PJSIP_ROLE_UAC), statusCode(0), pjTransaction(NULL)
+{
 }