mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
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/branches/1.4@91070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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),
|
||||
|
Reference in New Issue
Block a user