From: Sean Bright <sean@malleable.com>
Date: Mon, 1 Mar 2010 19:39:37 +0000 (+0000)
Subject: Merged revisions 249672 via svnmerge from
X-Git-Tag: 1.6.1.18-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c51f7866f61d40e0a97dc66ca1ccc96cf99a5129;p=thirdparty%2Fasterisk.git

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.1@249674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4d07325fe9..a615992799 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -748,7 +748,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);