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

Fix small logic errors (bug #242)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1494 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-09-10 05:24:49 +00:00
parent c874416036
commit ac19ba51bd
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pbx.c
View File

@@ -1134,7 +1134,7 @@ static int pbx_extension_helper(struct ast_channel *c, char *context, char *exte
ast_mutex_unlock(&conlock);
if (app) {
if (c->context != context)
strncpy(c->context, context, sizeof(c->context-1));
strncpy(c->context, context, sizeof(c->context)-1);
if (c->exten != exten)
strncpy(c->exten, exten, sizeof(c->exten)-1);
c->priority = priority;
@@ -2512,7 +2512,7 @@ static int handle_show_dialplan(int fd, int argc, char *argv[])
/* try to lock contexts */
if (ast_lock_contexts()) {
ast_cli(LOG_WARNING, "Failed to lock contexts list\n");
ast_log(LOG_WARNING, "Failed to lock contexts list\n");
return RESULT_FAILURE;
}
@@ -3798,12 +3798,16 @@ int ast_pbx_outgoing_exten(char *type, int format, void *data, int timeout, char
res = 0;
if (option_verbose > 3)
ast_verbose(VERBOSE_PREFIX_4 "Channel %s was answered.\n", chan->name);
if (context && strlen(context))
if (context && *context)
strncpy(chan->context, context, sizeof(chan->context) - 1);
if (exten && strlen(exten))
if (exten && *exten)
strncpy(chan->exten, exten, sizeof(chan->exten) - 1);
if (callerid && strlen(callerid))
strncpy(chan->callerid, callerid, sizeof(chan->callerid) - 1);
if (callerid && *callerid) {
/* XXX call ast_set_callerid? */
if (chan->callerid)
free(chan->callerid);
chan->callerid = strdup(callerid);
}
if (priority > 0)
chan->priority = priority;
if (sync > 1) {