[svn-commits] seanbright: branch 1.6.2 r304776 - /branches/1.6.2/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sat Jan 29 12:08:14 2011
New Revision: 304776

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304776
Log:
If we fail to allocate our announcement objects, make sure we don't leak objects.

The majority of this patch was committed already in r304726 and r304729.

(issue #18225)
Reported by: kenji

(issue #18444)
Reported by: junky

(closes issue #18343)
Reported by: kobaz
Patches:
      meetme-refs.diff uploaded by kobaz (license 834)

Modified:
    branches/1.6.2/apps/app_meetme.c

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=304776&r1=304775&r2=304776
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Sat Jan 29 12:08:14 2011
@@ -2475,7 +2475,7 @@
 	if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW)) && conf->users > 1) {
 		struct announce_listitem *item;
 		if (!(item = ao2_alloc(sizeof(*item), NULL)))
-			return -1;
+			goto outrun;
 		ast_copy_string(item->namerecloc, user->namerecloc, sizeof(item->namerecloc));
 		ast_copy_string(item->language, chan->language, sizeof(item->language));
 		item->confchan = conf->chan;
@@ -3375,7 +3375,7 @@
 	if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW)) && conf->users > 1) {
 		struct announce_listitem *item;
 		if (!(item = ao2_alloc(sizeof(*item), NULL)))
-			return -1;
+			goto outrun;
 		ast_copy_string(item->namerecloc, user->namerecloc, sizeof(item->namerecloc));
 		ast_copy_string(item->language, chan->language, sizeof(item->language));
 		item->confchan = conf->chan;