[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r304176 - /team/dvossel/fixt...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Jan 26 14:21:59 2011
New Revision: 304176

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304176
Log:
Cleanup correctly on alloc error in conf_run

Modified:
    team/dvossel/fixtheworld_phase1_step3/apps/app_meetme.c

Modified: team/dvossel/fixtheworld_phase1_step3/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/apps/app_meetme.c?view=diff&rev=304176&r1=304175&r2=304176
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/apps/app_meetme.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/apps/app_meetme.c Wed Jan 26 14:21:59 2011
@@ -2683,7 +2683,7 @@
 		struct announce_listitem *item;
 		if (!(item = ao2_alloc(sizeof(*item), NULL))) {
 			ret = -1;
-			goto conf_run_cleanup;
+			goto outrun;
 		}
 		ast_copy_string(item->namerecloc, user->namerecloc, sizeof(item->namerecloc));
 		ast_copy_string(item->language, chan->language, sizeof(item->language));
@@ -3736,7 +3736,7 @@
 		struct announce_listitem *item;
 		if (!(item = ao2_alloc(sizeof(*item), NULL))) {
 			res = -1;
-			goto conf_run_cleanup;
+			goto outrun;
 		}
 		ast_copy_string(item->namerecloc, user->namerecloc, sizeof(item->namerecloc));
 		ast_copy_string(item->language, chan->language, sizeof(item->language));