Merged revisions 296628 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 29 Nov 2010 21:31:05 +0000 (21:31 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 29 Nov 2010 21:31:05 +0000 (21:31 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296628 | russell | 2010-11-29 15:26:44 -0600 (Mon, 29 Nov 2010) | 6 lines

  Complete some error handling in transmit_publish() in chan_sip.c.

  This error handling block caught my eye.  It was missing a couple of things,
  but it should be safe now.  Thanks to mmichelson for the quick peer review
  on IRC.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@296630 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 47c0ccf..128fbd1 100644 (file)
@@ -11439,8 +11439,10 @@ static int transmit_publish(struct sip_epa_entry *epa_entry, enum sip_publish_ty
        sip_pvt_lock(pvt);
 
        if (create_addr(pvt, epa_entry->destination, NULL, TRUE, NULL)) {
+               sip_pvt_unlock(pvt);
                dialog_unlink_all(pvt, TRUE, TRUE);
                dialog_unref(pvt, "create_addr failed in transmit_publish. Unref dialog");
+               return -1;
        }
        ast_sip_ouraddrfor(&pvt->sa, &pvt->ourip, pvt);
        ast_set_flag(&pvt->flags[0], SIP_OUTGOING);