Merged revisions 164977 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Tue, 16 Dec 2008 23:06:04 +0000 (23:06 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 16 Dec 2008 23:06:04 +0000 (23:06 +0000)
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/trunk@164978 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 73fece9..a216316 100644 (file)
@@ -10443,7 +10443,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;
        }