kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 291905 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291905 | twilson | 2010-10-15 09:39:58 -0700 (Fri, 15 Oct 2010) | 14 lines
  
  Merged revisions 291904 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r291904 | twilson | 2010-10-15 09:16:57 -0700 (Fri, 15 Oct 2010) | 7 lines
    
    Don't crash or deadlock on module unload
    
    We can't hold the lock while pthread_join is called since aji_log_hook will
    attempt to lock from the other therad. We reorder the pthread_join and
    ast_aji_disconnect so that we don't do an SSL_read() while SSL_shutdown is
    running, causing a crash.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2010-10-15 16:54:07 +00:00
parent dc0b76c04c
commit 45fb4df288
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_jabber.c
View File

@@ -4695,12 +4695,12 @@ static int unload_module(void)
ast_custom_function_unregister(&jabberreceive_function); ast_custom_function_unregister(&jabberreceive_function);
ASTOBJ_CONTAINER_TRAVERSE(&clients, 1, { ASTOBJ_CONTAINER_TRAVERSE(&clients, 1, {
ASTOBJ_RDLOCK(iterator); ASTOBJ_WRLOCK(iterator);
ast_debug(3, "JABBER: Releasing and disconnecting client: %s\n", iterator->name); ast_debug(3, "JABBER: Releasing and disconnecting client: %s\n", iterator->name);
iterator->state = AJI_DISCONNECTING; iterator->state = AJI_DISCONNECTING;
ast_aji_disconnect(iterator);
pthread_join(iterator->thread, NULL);
ASTOBJ_UNLOCK(iterator); ASTOBJ_UNLOCK(iterator);
pthread_join(iterator->thread, NULL);
ast_aji_disconnect(iterator);
}); });
ASTOBJ_CONTAINER_DESTROYALL(&clients, aji_client_destroy); ASTOBJ_CONTAINER_DESTROYALL(&clients, aji_client_destroy);