Merged revisions 304726 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r304726 | seanbright | 2011-01-29 11:26:57 -0500 (Sat, 29 Jan 2011) | 9 lines

  Fix user reference leak in MeetMe.

  We were unlinking the user from the conferences user container, but not
  decrementing the reference count of the user as well, resulting in a leak.

  (closes issue #18444)
  Reported by: junky
  Tested by: seanbright
........

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 8ce78784dad5bab7067f66571df252af6b0654e4..44a4564ca6de8b1340fc5d1be45a73b72aa827d6 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3700,9 +3700,8 @@ bailoutandtrynormal:
                ast_dsp_free(dsp);
        }
        
-       if (!user->user_no) {
-               ao2_ref(user, -1);
-       } else { /* Only cleanup users who really joined! */
+       if (user->user_no) {
+               /* Only cleanup users who really joined! */
                now = ast_tvnow();
                hr = (now.tv_sec - user->jointime) / 3600;
                min = ((now.tv_sec - user->jointime) % 3600) / 60;
@@ -3756,6 +3755,7 @@ bailoutandtrynormal:
                        pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
                }
        }
+       ao2_ref(user, -1);
        AST_LIST_UNLOCK(&confs);
 
        return ret;