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.4@164977 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d478892da2087802596d24665725d4bdf716435b..b3367e488662ab35280124ef12ed3eb3c375dfe0 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7627,7 +7627,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;
        }