[asterisk-commits] seanbright: trunk r304778 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sat Jan 29 12:10:34 2011
New Revision: 304778

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

................
  r304777 | seanbright | 2011-01-29 13:09:37 -0500 (Sat, 29 Jan 2011) | 22 lines
  
  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:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

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

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=304778&r1=304777&r2=304778
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Sat Jan 29 12:10:34 2011
@@ -2679,7 +2679,7 @@
 			ast_test_flag64(confflags, CONFFLAG_INTROUSERNOREVIEW) || ast_test_flag64(confflags, CONFFLAG_INTROUSER_VMREC)) && 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;
@@ -3738,7 +3738,7 @@
 	if (!ast_test_flag64(confflags, CONFFLAG_QUIET) && ast_test_flag64(confflags, CONFFLAG_INTROUSER |CONFFLAG_INTROUSERNOREVIEW | CONFFLAG_INTROUSER_VMREC) && 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;