kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock when using dummy channels.

Browse Source 
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/branches/1.8@337973 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-09-26 19:30:39 +00:00
parent 234ee31f62
commit f2e1640435
17 changed files with 96 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cel/cel_custom.c
View File

@@ -128,7 +128,6 @@ static void custom_log(const struct ast_event *event, void *userdata)
}
dummy = ast_cel_fabricate_channel_from_event(event);
if (!dummy) {
ast_log(LOG_ERROR, "Unable to fabricate channel from CEL event.\n");
return;
@@ -163,7 +162,7 @@ static void custom_log(const struct ast_event *event, void *userdata)
AST_RWLIST_UNLOCK(&sinks);
ast_channel_release(dummy);
ast_channel_unref(dummy);
}
static int unload_module(void)

2
cel/cel_sqlite3_custom.c
View File

@@ -262,7 +262,7 @@ static void write_cel(const struct ast_event *event, void *userdata)
}
sql = sqlite3_mprintf("INSERT INTO %q (%s) VALUES (%s)", table, columns, ast_str_buffer(value_string));
ast_debug(1, "About to log: %s\n", sql);
dummy = ast_channel_release(dummy);
dummy = ast_channel_unref(dummy);
ast_free(value_string);
}