Merged revisions 249671 via svnmerge from
authorSean Bright <sean@malleable.com>
Mon, 1 Mar 2010 19:36:30 +0000 (19:36 +0000)
committerSean Bright <sean@malleable.com>
Mon, 1 Mar 2010 19:36:30 +0000 (19:36 +0000)
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/trunk@249672 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index 09a102e..61594fb 100644 (file)
@@ -884,7 +884,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);