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)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@304777 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a113241b28bf0147cb77e564cdb536b834261b76..5ddf63eeef7a822ad85062ba740fa8d479fdaf20 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2632,7 +2632,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                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 @@ bailoutandtrynormal:
        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;