automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46602 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 989946aab57d347309d8cc1af9c1ec4624f79e62..be42558fcaeced9d4dacb0ea17339b596868f7e2 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6664,6 +6664,7 @@ static int register_verify(struct sip_pvt *p, struct sockaddr_in *sin, struct si
                        transmit_response(p, "100 Trying", req);
                        if (!(res = check_auth(p, req, p->randdata, sizeof(p->randdata), peer->name, peer->secret, peer->md5secret, SIP_REGISTER, uri, 0, ignore))) {
                                sip_cancel_destroy(p);
+
                                switch (parse_register_contact(p, peer, req)) {
                                case PARSE_REGISTER_FAILED:
                                        ast_log(LOG_WARNING, "Failed to parse contact info\n");