[asterisk-commits] russell: branch 1.6.1 r195023 - in /branches/1.6.1: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon May 18 08:07:23 2009
New Revision: 195023

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195023
Log:
Merged revisions 195021 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195021 | russell | 2009-05-18 07:59:11 -0500 (Mon, 18 May 2009) | 12 lines
  
  Recorded merge of revisions 195020 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r195020 | russell | 2009-05-18 07:57:46 -0500 (Mon, 18 May 2009) | 5 lines
    
    Don't try to unlock a bogus channel.
    
    (closes issue #15144)
    Reported by: cristiandimache
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/manager.c

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

Modified: branches/1.6.1/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/manager.c?view=diff&rev=195023&r1=195022&r2=195023
==============================================================================
--- branches/1.6.1/main/manager.c (original)
+++ branches/1.6.1/main/manager.c Mon May 18 08:07:23 2009
@@ -1845,6 +1845,7 @@
 			if (c) {
 				ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
 				ast_channel_free(c);
+				c = NULL;
 			} else
 				ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution.  Function results may be blank.\n");
 		} else