[asterisk-commits] seanbright: branch 1.8 r304777 - in /branches/1.8: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sat Jan 29 12:09:37 2011
New Revision: 304777

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304777
Log:
Merged revisions 304776 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r304776 | seanbright | 2011-01-29 13:08:14 -0500 (Sat, 29 Jan 2011) | 15 lines
  
  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.8/   (props changed)
    branches/1.8/apps/app_meetme.c

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

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=304777&r1=304776&r2=304777
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Sat Jan 29 12:09:37 2011
@@ -2632,7 +2632,7 @@
 		ast_test_flag64(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;
@@ -3688,7 +3688,7 @@
 	if (!ast_test_flag64(confflags, CONFFLAG_QUIET) && (ast_test_flag64(confflags, CONFFLAG_INTROUSER) || ast_test_flag64(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;