From 5c56fa7fb73d51f676dc30ee8f0902925eddb548 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 5 Dec 2007 01:59:32 +0000 Subject: [PATCH] Merged revisions 91070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r91070 | russell | 2007-12-04 18:35:31 -0600 (Tue, 04 Dec 2007) | 11 lines Fix some crashes in chan_iax2 that were reported as happening on Mac systems. It turns out that the problem was the Mac version of the ast_atomic_fetchadd_int() function. The Mac atomic add function returns the _new_ value, while this function is supposed to return the old value. So, the crashes happened on unreferencing objects. If the reference count was decreased to 1, ao2_ref() thought that it had been decreased to zero, and called the destructor. However, there was still an outstanding reference around. (closes issue #11176) (closes issue #11289) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91114 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/lock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 5f243915f6..c9f4b4eae5 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1115,12 +1115,12 @@ AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), #elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 4) AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), { - return OSAtomicAdd32(v, (int32_t *) p); + return OSAtomicAdd32(v, (int32_t *) p) - v; }) #elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 8) AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), { - return OSAtomicAdd64(v, (int64_t *) p); + return OSAtomicAdd64(v, (int64_t *) p) - v; #elif defined (__i386__) || defined(__x86_64__) #ifdef sun AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),