[asterisk-commits] tilghman: branch 1.6.1 r150636 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Oct 17 12:10:02 2008
New Revision: 150636

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150636
Log:
Merged revisions 150635 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r150635 | tilghman | 2008-10-17 12:09:03 -0500 (Fri, 17 Oct 2008) | 2 lines
  
  Make helper call a little safer (suggested by Russell on IRC)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=150636&r1=150635&r2=150636
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Fri Oct 17 12:10:02 2008
@@ -2312,8 +2312,9 @@
 	struct ast_channel *owner = NULL;
 
 retry:
-	pvt = iaxs[callno];
-	iax2_destroy_helper(pvt);
+	if ((pvt = iaxs[callno])) {
+		iax2_destroy_helper(pvt);
+	}
 
 	lastused[callno] = ast_tvnow();