[svn-commits] dvossel: branch 1.6.1 r229672 - in /branches/1.6.1: ./ funcs/

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Nov 12 10:48:46 2009
New Revision: 229672

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

................
  r229670 | dvossel | 2009-11-12 10:44:39 -0600 (Thu, 12 Nov 2009) | 12 lines
  
  Merged revisions 229669 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r229669 | dvossel | 2009-11-12 10:41:49 -0600 (Thu, 12 Nov 2009) | 6 lines
    
    fixes merging error, datastore was being freed in the wrong function.
    
    (closes issue #16219)
    Reported by: aragon
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_audiohookinherit.c

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

Modified: branches/1.6.1/funcs/func_audiohookinherit.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/funcs/func_audiohookinherit.c?view=diff&rev=229672&r1=229671&r2=229672
==============================================================================
--- branches/1.6.1/funcs/func_audiohookinherit.c (original)
+++ branches/1.6.1/funcs/func_audiohookinherit.c Thu Nov 12 10:48:46 2009
@@ -74,7 +74,6 @@
 		ast_debug(3, "Moved audiohook %s from %s(%p) to %s(%p)\n",
 			audiohook->source, old_chan->name, old_chan, new_chan->name, new_chan);
 	}
-	ast_free(datastore);
 	return;
 }
 
@@ -91,6 +90,8 @@
 	while ((inheritable_audiohook = AST_LIST_REMOVE_HEAD(&audiohook_inheritance_datastore->allowed_list, list))) {
 		ast_free(inheritable_audiohook);
 	}
+
+	ast_free(audiohook_inheritance_datastore);
 }
 
 /*! \brief create an audiohook_inheritance_datastore and attach it to a channel