[Freeswitch-svn] [commit] r8466 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua

[Freeswitch SVN]

Author: mikej
Date: Mon May 19 12:55:53 2008
New Revision: 8466

Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c

Log:
Fri May 16 05:06:09 EDT 2008  Pekka.Pessi at nokia.com
  * nua_register.c: nr->nr_tport was used even if nr was NULL
  
  Problem detected by Klocwork.



Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Mon May 19 12:55:53 2008
@@ -1 +1 @@
-Mon May 19 12:55:08 EDT 2008
+Mon May 19 12:55:48 EDT 2008

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c	Mon May 19 12:55:53 2008
@@ -715,6 +715,7 @@
   sip_contact_t *m, *contacts = sip->sip_contact;
   char const *min_expires = NULL;
   int unreg;
+  tport_t *tport = NULL;
 
   (void)nh;
 
@@ -758,6 +759,8 @@
       if (previous)
 	sip_add_dup(msg, sip, (sip_header_t *)previous);
     }
+
+    tport = nr->nr_tport;
   }
 
   for (m = sip->sip_contact; m; m = m->m_next) {
@@ -792,7 +795,7 @@
 				  TAG_IF(unreg, NTATAG_SIGCOMP_CLOSE(1)),
 				  TAG_IF(!unreg, NTATAG_COMP("sigcomp")),
 #endif
-				  NTATAG_TPORT(nr->nr_tport),
+				  NTATAG_TPORT(tport),
 				  TAG_NEXT(tags));
 }