Merged revisions 168975 via svnmerge from

[asterisk/asterisk.git] / channels / chan_sip.c

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ce796fc..85073e4 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16884,7 +16884,11 @@ static int handle_response_register(struct sip_pvt *p, int resp, char *rest, str
                break;
        case 408:       /* Request timeout */
                /* Got a timeout response, so reset the counter of failed responses */
-               r->regattempts = 0;
+               if (r) {
+                       r->regattempts = 0;
+               } else {
+                       ast_log(LOG_WARNING, "Got a 408 response to our REGISTER on call %s after we had destroyed the registry object\n", p->callid);
+               }
                break;
        case 423:       /* Interval too brief */
                r->expiry = atoi(get_header(req, "Min-Expires"));