[svn-commits] seanbright: branch 1.6.0 r249673 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Mar  1 13:38:08 2010
New Revision: 249673

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249673
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=249673&r1=249672&r2=249673
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Mon Mar  1 13:38:08 2010
@@ -719,7 +719,7 @@
 	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);