[asterisk-commits] jrose: trunk r388579 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon May 13 14:29:56 2013
New Revision: 388579

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388579
Log:
pbx: Fix lack of cleanup on macrolock and context_table

(closes issue ASTERISK-21723)
Reported by: Corey Farrell
Patches:
    core-pbx-cleanup.patch uploaded by Correy Farrell (license 5909)
........

Merged revisions 388532 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 388578 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

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

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=388579&r1=388578&r2=388579
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Mon May 13 14:29:56 2013
@@ -10435,6 +10435,7 @@
 	}
 	tmp->root = NULL;
 	ast_rwlock_destroy(&tmp->lock);
+	ast_mutex_destroy(&tmp->macrolock);
 	ast_free(tmp);
 }
 
@@ -12142,6 +12143,10 @@
 		ao2_ref(statecbs, -1);
 		statecbs = NULL;
 	}
+	if (contexts_table) {
+		ast_hashtab_destroy(contexts_table, NULL);
+	}
+	pbx_builtin_clear_globals();
 }
 
 int ast_pbx_init(void)