[asterisk-commits] file: trunk r94908 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Dec 27 11:28:52 2007
New Revision: 94908

URL: http://svn.digium.com/view/asterisk?view=rev&rev=94908
Log:
Merged revisions 94905 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r94905 | file | 2007-12-27 13:27:11 -0400 (Thu, 27 Dec 2007) | 4 lines

Use ast_strlen_zero to see if our_contact is set or not on the dialog. It is possible for it to be a pointer to NULL.
(closes issue #11557)
Reported by: FuriousGeorge

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=94908&r1=94907&r2=94908
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Dec 27 11:28:52 2007
@@ -6602,7 +6602,7 @@
 			snprintf(contact, sizeof(contact), "%s;expires=%d", p->our_contact, p->expiry);
 			add_header(resp, "Contact", contact);	/* Not when we unregister */
 		}
-	} else if (msg[0] != '4' && p->our_contact[0]) {
+	} else if (msg[0] != '4' && !ast_strlen_zero(p->our_contact)) {
 		add_header(resp, "Contact", p->our_contact);
 	}