diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-05 00:35:31 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-05 00:35:31 +0000 |
| commit | e414addab5adcd079281cb36c72136e95c49693e (patch) | |
| tree | a975fec3afd5a7a859f01331d10bb0e47e31531b /include/asterisk/lock.h | |
| parent | 66be059151e9c96380e9e1555d287260f6bc8763 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@91070 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/lock.h')
| -rw-r--r-- | include/asterisk/lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 8d4e5c8f9..d9e5ec372 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1104,12 +1104,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__) #ifdef sun AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v), |