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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94908 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9390fc5e11ac9bfc68fd6e55a9c4bca296a667bc..91fa1458e83334762b677ebea4f6e401fd704bff 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6602,7 +6602,7 @@ static int respprep(struct sip_request *resp, struct sip_pvt *p, const char *msg
                        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);
        }