kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential segfault, add support for MacOS X locks

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-24 15:28:36 +00:00
parent 9082b027ef
commit 776497fb6b
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asterisk/lock.h
View File

@@ -20,6 +20,14 @@
#define AST_PTHREADT_NULL (pthread_t) -1 #define AST_PTHREADT_NULL (pthread_t) -1
#define AST_PTHREADT_STOP (pthread_t) -2 #define AST_PTHREADT_STOP (pthread_t) -2
#ifdef __APPLE__
/* Provide the Linux initializers for MacOS X */
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP { 0x4d555458, \
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
0x20 } }
#endif
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
#ifdef THREAD_CRASH #ifdef THREAD_CRASH

4
manager.c
View File

@@ -467,6 +467,10 @@ static int action_redirect(struct mansession *s, struct message *m)
return 0; return 0;
} }
chan = ast_get_channel_by_name_locked(name); chan = ast_get_channel_by_name_locked(name);
if (!chan) {
astman_send_error(s, m, "Channel not existant");
return 0;
}
if (strlen(name2)) if (strlen(name2))
chan2 = ast_get_channel_by_name_locked(name2); chan2 = ast_get_channel_by_name_locked(name2);
res = ast_async_goto(chan, context, exten, pi); res = ast_async_goto(chan, context, exten, pi);