-
- Downloads
Merged revisions 337974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r337974 | rmudgett | 2011-09-26 14:35:23 -0500 (Mon, 26 Sep 2011) | 37 lines Merged revisions 337973 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r337973 | rmudgett | 2011-09-26 14:30:39 -0500 (Mon, 26 Sep 2011) | 30 lines Fix deadlock when using dummy channels. Dummy channels created by ast_dummy_channel_alloc() should be destoyed by ast_channel_unref(). Using ast_channel_release() needlessly grabs the channel container lock and can cause a deadlock as a result. * Analyzed use of ast_dummy_channel_alloc() and made use ast_channel_unref() when done with the dummy channel. (Primary reason for the reported deadlock.) * Made app_dial.c:dial_exec_full() not call ast_call() holding any channel locks. Chan_local could not perform deadlock avoidance correctly. (Potential deadlock exposed by this issue. Secondary reason for the reported deadlock since the held lock was part of the deadlock chain.) * Fixed some uses of ast_dummy_channel_alloc() not checking the returned channel pointer for failure. * Fixed some potential chan=NULL pointer usage in func_odbc.c. Protected by testing the bogus_chan value. * Fixed needlessly clearing a 1024 char auto array when setting the first char to zero is enough in manager.c:action_getvar(). (closes issue ASTERISK-18613) Reported by: Thomas Arimont Patches: jira_asterisk_18613_v1.8.patch (license #5621) patch uploaded by rmudgett Tested by: Thomas Arimont ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Showing
- apps/app_dial.c 2 additions, 0 deletionsapps/app_dial.c
- apps/app_minivm.c 4 additions, 2 deletionsapps/app_minivm.c
- apps/app_voicemail.c 13 additions, 7 deletionsapps/app_voicemail.c
- cdr/cdr_custom.c 1 addition, 2 deletionscdr/cdr_custom.c
- cdr/cdr_manager.c 1 addition, 1 deletioncdr/cdr_manager.c
- cdr/cdr_sqlite3_custom.c 1 addition, 1 deletioncdr/cdr_sqlite3_custom.c
- cdr/cdr_syslog.c 1 addition, 1 deletioncdr/cdr_syslog.c
- cel/cel_custom.c 1 addition, 2 deletionscel/cel_custom.c
- cel/cel_sqlite3_custom.c 1 addition, 1 deletioncel/cel_sqlite3_custom.c
- funcs/func_odbc.c 21 additions, 12 deletionsfuncs/func_odbc.c
- include/asterisk/cel.h 5 additions, 2 deletionsinclude/asterisk/cel.h
- include/asterisk/channel.h 24 additions, 1 deletioninclude/asterisk/channel.h
- main/cel.c 1 addition, 1 deletionmain/cel.c
- main/logger.c 4 additions, 1 deletionmain/logger.c
- main/manager.c 2 additions, 2 deletionsmain/manager.c
- main/pbx.c 11 additions, 7 deletionsmain/pbx.c
- tests/test_gosub.c 3 additions, 3 deletionstests/test_gosub.c
Loading
Please register or sign in to comment