From cbad8e6dca83dd0d2abb19ee659e5b8f7ff48157 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 16 Dec 2008 23:07:33 +0000 Subject: [PATCH] Merged revisions 164978 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r164978 | mmichelson | 2008-12-16 17:06:04 -0600 (Tue, 16 Dec 2008) | 15 lines Merged revisions 164977 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r164977 | mmichelson | 2008-12-16 17:04:27 -0600 (Tue, 16 Dec 2008) | 7 lines After looking through SIP registration code most of the day, this is one of the few things I could find that was just plain wrong. Even though it probably isn't possible for it to happen, it seems weird to have code that checks if a pointer is NULL and then immediately dereferences that pointer if it was NULL. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@164980 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index bbe309ace2..c365b86986 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9805,7 +9805,9 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char * /* exit if we are already in process with this registrar ?*/ if (r == NULL || ((auth == NULL) && (r->regstate == REG_STATE_REGSENT || r->regstate == REG_STATE_AUTHSENT))) { - ast_log(LOG_NOTICE, "Strange, trying to register %s@%s when registration already pending\n", r->username, r->hostname); + if (r) { + ast_log(LOG_NOTICE, "Strange, trying to register %s@%s when registration already pending\n", r->username, r->hostname); + } return 0; }