diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-01 19:39:37 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-01 19:39:37 +0000 |
| commit | 0fa06c55d2af5d8f2697cb6a8f19e9bef3c2aa1c (patch) | |
| tree | e64d7051f84abca79bbc2a4e120315cc4df05d29 | |
| parent | a177b0ca50693e117812d456a757128c0add56b7 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@249674 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 4d07325fe..a61599279 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); |