[asterisk-commits] russell: trunk r296630 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Nov 29 15:31:05 2010
New Revision: 296630

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296630
Log:
Merged revisions 296628 via svnmerge from 
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.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=296630&r1=296629&r2=296630
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Nov 29 15:31:05 2010
@@ -11439,8 +11439,10 @@
 	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);