[asterisk-commits] dvossel: branch 1.4 r229669 - /branches/1.4/funcs/func_audiohookinherit.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Nov 12 10:41:49 2009
New Revision: 229669

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229669
Log:
fixes merging error, datastore was being freed in the wrong function.

(closes issue #16219)
Reported by: aragon


Modified:
    branches/1.4/funcs/func_audiohookinherit.c

Modified: branches/1.4/funcs/func_audiohookinherit.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/funcs/func_audiohookinherit.c?view=diff&rev=229669&r1=229668&r2=229669
==============================================================================
--- branches/1.4/funcs/func_audiohookinherit.c (original)
+++ branches/1.4/funcs/func_audiohookinherit.c Thu Nov 12 10:41:49 2009
@@ -77,7 +77,6 @@
 				audiohook->source, old_chan->name, old_chan, new_chan->name, new_chan);
 		}
 	}
-	ast_free(datastore);
 	return;
 }
 
@@ -94,6 +93,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