Merged revisions 249672 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r249672 | seanbright | 2010-03-01 14:36:30 -0500 (Mon, 01 Mar 2010) | 18 lines

  Merged revisions 249671 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r249671 | seanbright | 2010-03-01 14:35:01 -0500 (Mon, 01 Mar 2010) | 11 lines

    Fix crash in app_voicemail related to message counting.

    We were passing a 'struct inprocess **' and treating it like a 'struct inprocess *'
    causing a segfault.

    (closes issue #16921)
    Reported by: whardier
    Patches:
          20100301_issue16921.patch uploaded by seanbright (license 71)
    Tested by: whardier
  ........
................

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 53d6b5e7524522de07fc62dd88eea3176cdb7268..506e93ffe1b0283cf4fb24ebb01ce1495eec4e65 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -719,7 +719,7 @@ static int inprocess_count(const char *context, const char *mailbox, int delta)
        strcpy(arg->mailbox, mailbox); /* SAFE */
        strcpy(arg->context, context); /* SAFE */
        ao2_lock(inprocess_container);
-       if ((i = ao2_find(inprocess_container, &arg, 0))) {
+       if ((i = ao2_find(inprocess_container, arg, 0))) {
                int ret = ast_atomic_fetchadd_int(&i->count, delta);
                ao2_unlock(inprocess_container);
                ao2_ref(i, -1);