[asterisk-commits] kharwell: branch 11 r398022 - in /branches/11: ./ main/features.c

[SVN commits to the Asterisk project]

Author: kharwell
Date: Fri Aug 30 12:00:26 2013
New Revision: 398022

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398022
Log:
Fix memory leak

Fixed a features.c test that leaked a reference to a parked call.  This caused
chancount to never reach 0, so graceful shutdown stops.  Also added an
unregister test.

(closes issue ASTERISK-22413)
Reported by: Corey Farrell
Patches:
     features-TEST_FRAMEWORK.patch uploaded by coreyfarrell (license 5909)
........

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

Modified:
    branches/11/   (props changed)
    branches/11/main/features.c

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

Modified: branches/11/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/features.c?view=diff&rev=398022&r1=398021&r2=398022
==============================================================================
--- branches/11/main/features.c (original)
+++ branches/11/main/features.c Fri Aug 30 12:00:26 2013
@@ -8850,6 +8850,7 @@
 		}
 		res = -1;
 	}
+	parked_chan = ast_channel_unref(parked_chan);
 
 
 exit_features_test:
@@ -9035,6 +9036,9 @@
 	ast_unregister_application(parkcall);
 	ast_unregister_application(parkedcall);
 	ast_unregister_application(app_bridge);
+#if defined(TEST_FRAMEWORK)
+	AST_TEST_UNREGISTER(features_test);
+#endif	/* defined(TEST_FRAMEWORK) */
 
 	pthread_cancel(parking_thread);
 	pthread_kill(parking_thread, SIGURG);