Changeset 4615 for pjproject/trunk

Timestamp:

Oct 8, 2013 11:14:42 AM (11 years ago)

Author:

bennylp

Message:

Re #1703 General bug fixes: fixed some wrong null checking order

Location:

pjproject/trunk

Files:

• pjnath/src/pjnath/stun_msg.c (modified) (1 diff)
• pjnath/src/pjnath/stun_sock.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_msg.c

@@ -1138 +1138 @@
                                               const pj_str_t *value)
 {
-    INIT_ATTR(attr, attr_type, value->slen);
-    if (value && value->slen)
+    INIT_ATTR(attr, attr_type, 0);
+    if (value && value->slen) {
+        attr->value.slen = value->slen;
         pj_strdup(pool, &attr->value, value);
-    else
-        attr->value.slen = 0;
+    }
     return PJ_SUCCESS;
 }

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -212 +212 @@
         stun_sock->ka_interval = PJ_STUN_KEEP_ALIVE_SEC;
 
-    if (cfg && cfg->grp_lock) {
+    if (cfg->grp_lock) {
         stun_sock->grp_lock = cfg->grp_lock;
     } else {

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -578 +578 @@
 PJ_DEF(char*) pjsip_tx_data_get_info( pjsip_tx_data *tdata )
 {
+    PJ_ASSERT_RETURN(tdata, "NULL");
+
     /* tdata->info may be assigned by application so if it exists
      * just return it.
@@ -584 +586 @@
         return tdata->info;
 
-    if (tdata==NULL || tdata->msg==NULL)
+    if (tdata->msg==NULL)
         return "NULL";