Merged revisions 304727 via svnmerge from

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

................
  r304727 | seanbright | 2011-01-29 11:28:27 -0500 (Sat, 29 Jan 2011) | 16 lines

  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/trunk@304728 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5910403..f315d3d 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3752,9 +3752,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;
@@ -3808,6 +3807,7 @@ bailoutandtrynormal:
                        pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
                }
        }
+       ao2_ref(user, -1);
        AST_LIST_UNLOCK(&confs);
 
        return ret;