summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/app_dial.c2
-rw-r--r--apps/app_minivm.c6
-rw-r--r--apps/app_voicemail.c20
-rw-r--r--cdr/cdr_custom.c3
-rw-r--r--cdr/cdr_manager.c2
-rw-r--r--cdr/cdr_sqlite3_custom.c2
-rw-r--r--cdr/cdr_syslog.c2
-rw-r--r--cel/cel_custom.c3
-rw-r--r--cel/cel_sqlite3_custom.c2
-rw-r--r--funcs/func_odbc.c33
-rw-r--r--include/asterisk/cel.h7
-rw-r--r--include/asterisk/channel.h25
-rw-r--r--main/cel.c2
-rw-r--r--main/logger.c5
-rw-r--r--main/manager.c4
-rw-r--r--main/pbx.c18
-rw-r--r--tests/test_gosub.c6
17 files changed, 96 insertions, 46 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 6bea10fc5..a9d1079a1 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -2325,7 +2325,9 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
ast_copy_string(tc->exten, chan->exten, sizeof(tc->exten));
ast_channel_unlock(tc);
+ ast_channel_unlock(chan);
res = ast_call(tc, numsubst, 0); /* Place the call, but don't wait on the answer */
+ ast_channel_lock(chan);
/* Save the info in cdr's that we called them */
if (chan->cdr)
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 993a5a366..edffd4d3f 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -1313,6 +1313,9 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
}
/* Allocate channel used for chanvar substitution */
ast = ast_dummy_channel_alloc();
+ if (!ast) {
+ return -1;
+ }
snprintf(dur, sizeof(dur), "%d:%02d", duration / 60, duration % 60);
@@ -1473,8 +1476,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
ast_safe_system(tmp2);
ast_debug(1, "Sent message to %s with command '%s' - %s\n", vmu->email, global_mailcmd, template->attachment ? "(media attachment)" : "");
ast_debug(3, "Actual command used: %s\n", tmp2);
- if (ast)
- ast = ast_channel_release(ast);
+ ast = ast_channel_unref(ast);
ast_free(str1);
ast_free(str2);
return 0;
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 3c93ae3dc..c9913924e 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4573,7 +4573,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
} else {
fprintf(p, "From: %s <%s>" ENDL, ast_str_quote(&str2, 0, ast_str_buffer(str1)), who);
}
- ast = ast_channel_release(ast);
+ ast = ast_channel_unref(ast);
} else {
ast_log(AST_LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
}
@@ -4618,7 +4618,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
} else {
fprintf(p, "Subject: %s" ENDL, ast_str_buffer(str1));
}
- ast = ast_channel_release(ast);
+ ast = ast_channel_unref(ast);
} else {
ast_log(AST_LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
}
@@ -4704,7 +4704,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
#else
fprintf(p, "%s" ENDL, ast_str_buffer(str1));
#endif
- ast = ast_channel_release(ast);
+ ast = ast_channel_unref(ast);
} else {
ast_log(AST_LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
}
@@ -4931,7 +4931,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
} else {
fprintf(p, "From: %s <%s>" ENDL, ast_str_quote(&str2, 0, ast_str_buffer(str1)), who);
}
- ast = ast_channel_release(ast);
+ ast = ast_channel_unref(ast);
} else {
ast_log(AST_LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
}
@@ -4975,7 +4975,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
} else {
fprintf(p, "Subject: %s" ENDL, ast_str_buffer(str1));
}
- ast = ast_channel_release(ast);
+ ast = ast_channel_unref(ast);
} else {
ast_log(AST_LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
}
@@ -4993,7 +4993,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, category, flag);
ast_str_substitute_variables(&str1, 0, ast, pagerbody);
fprintf(p, "%s" ENDL, ast_str_buffer(str1));
- ast = ast_channel_release(ast);
+ ast = ast_channel_unref(ast);
} else {
ast_log(AST_LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
}
@@ -12689,6 +12689,9 @@ AST_TEST_DEFINE(test_voicemail_msgcount)
!(vmu = find_or_create(testcontext, testmailbox))) {
ast_test_status_update(test, "Cannot create vmu structure\n");
ast_unreplace_sigchld();
+#ifdef IMAP_STORAGE
+ chan = ast_channel_unref(chan);
+#endif
return AST_TEST_FAIL;
}
@@ -12708,6 +12711,9 @@ AST_TEST_DEFINE(test_voicemail_msgcount)
ast_test_status_update(test, "Unable to create test voicemail: %s\n",
syserr > 0 ? strerror(syserr) : "unable to fork()");
ast_unreplace_sigchld();
+#ifdef IMAP_STORAGE
+ chan = ast_channel_unref(chan);
+#endif
return AST_TEST_FAIL;
}
}
@@ -12781,7 +12787,7 @@ AST_TEST_DEFINE(test_voicemail_msgcount)
}
#ifdef IMAP_STORAGE
- chan = ast_channel_release(chan);
+ chan = ast_channel_unref(chan);
#endif
/* And remove test directory */
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index 6a2751d1f..ee423d3e6 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -129,7 +129,6 @@ static int custom_log(struct ast_cdr *cdr)
}
dummy = ast_dummy_channel_alloc();
-
if (!dummy) {
ast_log(LOG_ERROR, "Unable to allocate channel for variable subsitution.\n");
return -1;
@@ -169,7 +168,7 @@ static int custom_log(struct ast_cdr *cdr)
AST_RWLIST_UNLOCK(&sinks);
- ast_channel_release(dummy);
+ ast_channel_unref(dummy);
return 0;
}
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index d5106b158..1d9eb6a6a 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -167,7 +167,7 @@ static int manager_log(struct ast_cdr *cdr)
}
dummy->cdr = ast_cdr_dup(cdr);
pbx_substitute_variables_helper(dummy, ast_str_buffer(customfields), buf, sizeof(buf) - 1);
- ast_channel_release(dummy);
+ ast_channel_unref(dummy);
}
ast_rwlock_unlock(&customfields_lock);
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 97d1a309e..65ef5b8a2 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -261,7 +261,7 @@ static int write_cdr(struct ast_cdr *cdr)
}
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);
- ast_channel_release(dummy);
+ ast_channel_unref(dummy);
ast_free(value_string);
}
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index b6fc90e0d..adf260594 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -116,7 +116,7 @@ static int syslog_log(struct ast_cdr *cdr)
AST_RWLIST_UNLOCK(&sinks);
- ast_channel_release(dummy);
+ ast_channel_unref(dummy);
return 0;
}
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index 54b1e4f5e..871408716 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -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)
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index 2906ed9ee..4596e770e 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -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);
}
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index e940021a3..eeb7d3be1 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -267,7 +267,7 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
ast_autoservice_stop(chan);
pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status);
} else {
- ast_channel_release(chan);
+ ast_channel_unref(chan);
}
return -1;
}
@@ -292,7 +292,7 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
ast_str_substitute_variables(&insertbuf, 0, chan, query->sql_insert);
if (bogus_chan) {
- chan = ast_channel_release(chan);
+ chan = ast_channel_unref(chan);
} else {
/* Restore prior values */
for (i = 0; i < args.argc; i++) {
@@ -474,7 +474,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
ast_str_substitute_variables(&sql, 0, chan, query->sql_read);
if (bogus_chan) {
- chan = ast_channel_release(chan);
+ chan = ast_channel_unref(chan);
} else {
/* Restore prior values */
for (x = 0; x < args.argc; x++) {
@@ -596,11 +596,9 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
obj = NULL;
- pbx_builtin_setvar_helper(chan, "ODBCSTATUS", "MEMERROR");
- if (chan)
+ if (!bogus_chan) {
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", "MEMERROR");
ast_autoservice_stop(chan);
- if (bogus_chan) {
- ast_channel_release(chan);
}
return -1;
}
@@ -631,9 +629,11 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
obj = NULL;
- pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount);
- pbx_builtin_setvar_helper(chan, "ODBCSTATUS", "MEMERROR");
- ast_autoservice_stop(chan);
+ if (!bogus_chan) {
+ pbx_builtin_setvar_helper(chan, "ODBCROWS", rowcount);
+ pbx_builtin_setvar_helper(chan, "ODBCSTATUS", "MEMERROR");
+ ast_autoservice_stop(chan);
+ }
return -1;
}
resultset = tmp;
@@ -1142,6 +1142,10 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args
char_args = ast_strdupa(a->argv[3]);
chan = ast_dummy_channel_alloc();
+ if (!chan) {
+ AST_RWLIST_UNLOCK(&queries);
+ return CLI_FAILURE;
+ }
AST_STANDARD_APP_ARGS(args, char_args);
for (i = 0; i < args.argc; i++) {
@@ -1150,7 +1154,7 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args
}
ast_str_substitute_variables(&sql, 0, chan, query->sql_read);
- chan = ast_channel_release(chan);
+ chan = ast_channel_unref(chan);
if (a->argc == 5 && !strcmp(a->argv[4], "exec")) {
/* Execute the query */
@@ -1352,6 +1356,10 @@ static char *cli_odbc_write(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
char_values = ast_strdupa(a->argv[4]);
chan = ast_dummy_channel_alloc();
+ if (!chan) {
+ AST_RWLIST_UNLOCK(&queries);
+ return CLI_FAILURE;
+ }
AST_STANDARD_APP_ARGS(args, char_args);
for (i = 0; i < args.argc; i++) {
@@ -1370,7 +1378,8 @@ static char *cli_odbc_write(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
pbx_builtin_pushvar_helper(chan, "VALUE", S_OR(a->argv[4], ""));
ast_str_substitute_variables(&sql, 0, chan, query->sql_write);
ast_debug(1, "SQL is %s\n", ast_str_buffer(sql));
- chan = ast_channel_release(chan);
+
+ chan = ast_channel_unref(chan);
if (a->argc == 6 && !strcmp(a->argv[5], "exec")) {
/* Execute the query */
diff --git a/include/asterisk/cel.h b/include/asterisk/cel.h
index 226a6cf24..b388ffd9b 100644
--- a/include/asterisk/cel.h
+++ b/include/asterisk/cel.h
@@ -190,8 +190,11 @@ void ast_cel_check_retire_linkedid(struct ast_channel *chan);
/*!
* \brief Create a fake channel from data in a CEL event
*
- * This function creates a fake channel containing the serialized channel data
- * in the given cel event. It must be released with ast_channel_release.
+ * \note
+ * This function creates a fake channel containing the
+ * serialized channel data in the given cel event. It should be
+ * released with ast_channel_unref() but could be released with
+ * ast_channel_release().
*
* \param event the CEL event
*
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 44f0a20f3..4d25f66e6 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1134,6 +1134,7 @@ struct ast_channel * attribute_malloc __attribute__((format(printf, 13, 14)))
__ast_channel_alloc(needqueue, state, cid_num, cid_name, acctcode, exten, context, linkedid, amaflag, \
__FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC)
/*!
* \brief Create a fake channel structure
*
@@ -1143,11 +1144,32 @@ struct ast_channel * attribute_malloc __attribute__((format(printf, 13, 14)))
* \note This function should ONLY be used to create a fake channel
* that can then be populated with data for use in variable
* substitution when a real channel does not exist.
+ *
+ * \note The created dummy channel should be destroyed by
+ * ast_channel_unref(). Using ast_channel_release() needlessly
+ * grabs the channel container lock and can cause a deadlock as
+ * a result. Also grabbing the channel container lock reduces
+ * system performance.
*/
-#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC)
#define ast_dummy_channel_alloc() __ast_dummy_channel_alloc(__FILE__, __LINE__, __PRETTY_FUNCTION__)
struct ast_channel *__ast_dummy_channel_alloc(const char *file, int line, const char *function);
#else
+/*!
+ * \brief Create a fake channel structure
+ *
+ * \retval NULL failure
+ * \retval non-NULL successfully allocated channel
+ *
+ * \note This function should ONLY be used to create a fake channel
+ * that can then be populated with data for use in variable
+ * substitution when a real channel does not exist.
+ *
+ * \note The created dummy channel should be destroyed by
+ * ast_channel_unref(). Using ast_channel_release() needlessly
+ * grabs the channel container lock and can cause a deadlock as
+ * a result. Also grabbing the channel container lock reduces
+ * system performance.
+ */
struct ast_channel *ast_dummy_channel_alloc(void);
#endif
@@ -1593,6 +1615,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer);
/*!
* \brief Make a call
+ * \note Absolutely _NO_ channel locks should be held before calling this function.
* \param chan which channel to make the call on
* \param addr destination of the call
* \param timeout time to wait on for connect
diff --git a/main/cel.c b/main/cel.c
index 7f5c24f40..ef37a1196 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -417,7 +417,7 @@ struct ast_channel *ast_cel_fabricate_channel_from_event(const struct ast_event
/* first, get the variables from the event */
if (ast_cel_fill_record(event, &record)) {
- ast_channel_release(tchan);
+ ast_channel_unref(tchan);
return NULL;
}
diff --git a/main/logger.c b/main/logger.c
index 5027bcbd4..6fc36df00 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -651,12 +651,15 @@ static int rotate_file(const char *filename)
if (!ast_strlen_zero(exec_after_rotate)) {
struct ast_channel *c = ast_dummy_channel_alloc();
char buf[512];
+
pbx_builtin_setvar_helper(c, "filename", filename);
pbx_substitute_variables_helper(c, exec_after_rotate, buf, sizeof(buf));
+ if (c) {
+ c = ast_channel_unref(c);
+ }
if (ast_safe_system(buf) == -1) {
ast_log(LOG_WARNING, "error executing '%s'\n", buf);
}
- c = ast_channel_release(c);
}
return res;
}
diff --git a/main/manager.c b/main/manager.c
index c5f973dd7..5320b3f52 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3122,7 +3122,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
const char *name = astman_get_header(m, "Channel");
const char *varname = astman_get_header(m, "Variable");
char *varval;
- char workspace[1024] = "";
+ char workspace[1024];
if (ast_strlen_zero(varname)) {
astman_send_error(s, m, "No variable specified");
@@ -3136,12 +3136,12 @@ static int action_getvar(struct mansession *s, const struct message *m)
}
}
+ workspace[0] = '\0';
if (varname[strlen(varname) - 1] == ')') {
if (!c) {
c = ast_dummy_channel_alloc();
if (c) {
ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
- c = ast_channel_release(c);
} else
ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution. Function results may be blank.\n");
} else {
diff --git a/main/pbx.c b/main/pbx.c
index 7e6e8a122..0e528fd4f 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3862,7 +3862,7 @@ void ast_str_substitute_variables_full(struct ast_str **buf, ssize_t maxlen, str
cp4 = ast_func_read2(c, finalvars, &substr3, 0) ? NULL : ast_str_buffer(substr3);
/* Don't deallocate the varshead that was passed in */
memcpy(&bogus->varshead, &old, sizeof(bogus->varshead));
- ast_channel_release(bogus);
+ ast_channel_unref(bogus);
} else {
ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution. Function results may be blank.\n");
}
@@ -4061,7 +4061,7 @@ void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead
cp4 = ast_func_read(c, vars, workspace, VAR_BUF_SIZE) ? NULL : workspace;
/* Don't deallocate the varshead that was passed in */
memcpy(&c->varshead, &old, sizeof(c->varshead));
- c = ast_channel_release(c);
+ c = ast_channel_unref(c);
} else {
ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution. Function results may be blank.\n");
}
@@ -8481,12 +8481,16 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
/* If we are adding a hint evalulate in variables and global variables */
if (priority == PRIORITY_HINT && strstr(application, "${") && !strstr(extension, "_")) {
struct ast_channel *c = ast_dummy_channel_alloc();
- ast_copy_string(c->exten, extension, sizeof(c->exten));
- ast_copy_string(c->context, con->name, sizeof(c->context));
+ if (c) {
+ ast_copy_string(c->exten, extension, sizeof(c->exten));
+ ast_copy_string(c->context, con->name, sizeof(c->context));
+ }
pbx_substitute_variables_helper(c, application, expand_buf, sizeof(expand_buf));
application = expand_buf;
- ast_channel_release(c);
+ if (c) {
+ ast_channel_unref(c);
+ }
}
length = sizeof(struct ast_exten);
@@ -8738,7 +8742,7 @@ static int ast_pbx_outgoing_cdr_failed(void)
chan->cdr = ast_cdr_alloc();
if (!chan->cdr) {
/* allocation of the cdr failed */
- chan = ast_channel_release(chan); /* free the channel */
+ chan = ast_channel_unref(chan); /* free the channel */
return -1; /* return failure */
}
@@ -8749,7 +8753,7 @@ static int ast_pbx_outgoing_cdr_failed(void)
ast_cdr_failed(chan->cdr); /* set the status to failed */
ast_cdr_detach(chan->cdr); /* post and free the record */
chan->cdr = NULL;
- chan = ast_channel_release(chan); /* free the channel */
+ chan = ast_channel_unref(chan); /* free the channel */
return 0; /* success */
}
diff --git a/tests/test_gosub.c b/tests/test_gosub.c
index a02441e57..e65ebbcbb 100644
--- a/tests/test_gosub.c
+++ b/tests/test_gosub.c
@@ -102,7 +102,7 @@ AST_TEST_DEFINE(test_gosub)
if (!(str = ast_str_create(16))) {
ast_test_status_update(test, "Unable to allocate dynamic string buffer\n");
- ast_channel_release(chan);
+ ast_channel_unref(chan);
return AST_TEST_FAIL;
}
@@ -110,7 +110,7 @@ AST_TEST_DEFINE(test_gosub)
if (!(con = ast_context_find_or_create(NULL, NULL, "tests_test_gosub_virtual_context", "test_gosub"))) {
ast_test_status_update(test, "Unable to create test dialplan context");
ast_free(str);
- ast_channel_release(chan);
+ ast_channel_unref(chan);
return AST_TEST_FAIL;
}
@@ -144,7 +144,7 @@ AST_TEST_DEFINE(test_gosub)
}
ast_free(str);
- ast_channel_release(chan);
+ ast_channel_unref(chan);
ast_context_remove_extension2(con, "s", 1, NULL, 0);
ast_context_destroy(con, "test_gosub");
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 13:04:55 +0000