Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

Remaining rgagnon source audit improvements (bug #2011)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Mark Spencer 21 years ago
parent 872685d088
commit 8ed49644a6
9 changed files with 169 additions and 135 deletions
Show Stats Download Patch File Download Diff File

97
cli.c
Unescape View File

@ -39,12 +39,19 @@
void ast_cli(int fd, char *fmt, ...) void ast_cli(int fd, char *fmt, ...)
{ {
char *stuff; char *stuff;
int res = 0;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vasprintf(&stuff, fmt, ap); res = vasprintf(&stuff, fmt, ap);
va_end(ap); va_end(ap);
ast_carefulwrite(fd, stuff, strlen(stuff), 100); if (res == -1) {
free(stuff); ast_log(LOG_ERROR, "Out of memory\n");
}
else {
ast_carefulwrite(fd, stuff, strlen(stuff), 100);
free(stuff);
}
} }
AST_MUTEX_DEFINE_STATIC(clilock); AST_MUTEX_DEFINE_STATIC(clilock);
@ -179,62 +186,76 @@ static char version_help[] =
static char *format_uptimestr(time_t timeval) static char *format_uptimestr(time_t timeval)
{ {
int years = 0, weeks = 0, days = 0, hours = 0, mins = 0, secs = 0; int years = 0, weeks = 0, days = 0, hours = 0, mins = 0, secs = 0;
char timestr[256]; char timestr[256]="";
int pos = 0; int bytes = 0;
int maxbytes = 0;
int offset = 0;
#define SECOND (1) #define SECOND (1)
#define MINUTE (SECOND*60) #define MINUTE (SECOND*60)
#define HOUR (MINUTE*60) #define HOUR (MINUTE*60)
#define DAY (HOUR*24) #define DAY (HOUR*24)
#define WEEK (DAY*7) #define WEEK (DAY*7)
#define YEAR (DAY*365) #define YEAR (DAY*365)
#define ESS(x) ((x == 1) ? "" : "s")
maxbytes = sizeof(timestr);
if (timeval < 0) if (timeval < 0)
return NULL; return NULL;
if (timeval > YEAR) { if (timeval > YEAR) {
years = (timeval / YEAR); years = (timeval / YEAR);
timeval -= (years * YEAR); timeval -= (years * YEAR);
if (years > 1) if (years > 0) {
pos += sprintf(timestr + pos, "%d years, ", years); snprintf(timestr + offset, maxbytes, "%d year%s, ", years, ESS(years));
else bytes = strlen(timestr + offset);
pos += sprintf(timestr + pos, "1 year, "); offset += bytes;
maxbytes -= bytes;
}
} }
if (timeval > WEEK) { if (timeval > WEEK) {
weeks = (timeval / WEEK); weeks = (timeval / WEEK);
timeval -= (weeks * WEEK); timeval -= (weeks * WEEK);
if (weeks > 1) if (weeks > 0) {
pos += sprintf(timestr + pos, "%d weeks, ", weeks); snprintf(timestr + offset, maxbytes, "%d week%s, ", weeks, ESS(weeks));
else bytes = strlen(timestr + offset);
pos += sprintf(timestr + pos, "1 week, "); offset += bytes;
maxbytes -= bytes;
}
} }
if (timeval > DAY) { if (timeval > DAY) {
days = (timeval / DAY); days = (timeval / DAY);
timeval -= (days * DAY); timeval -= (days * DAY);
if (days > 1) if (days > 0) {
pos += sprintf(timestr + pos, "%d days, ", days); snprintf(timestr + offset, maxbytes, "%d day%s, ", days, ESS(days));
else bytes = strlen(timestr + offset);
pos += sprintf(timestr + pos, "1 day, "); offset += bytes;
maxbytes -= bytes;
}
} }
if (timeval > HOUR) { if (timeval > HOUR) {
hours = (timeval / HOUR); hours = (timeval / HOUR);
timeval -= (hours * HOUR); timeval -= (hours * HOUR);
if (hours > 1) if (hours > 0) {
pos += sprintf(timestr + pos, "%d hours, ", hours); snprintf(timestr + offset, maxbytes, "%d hour%s, ", hours, ESS(hours));
else bytes = strlen(timestr + offset);
pos += sprintf(timestr + pos, "1 hour, "); offset += bytes;
maxbytes -= bytes;
}
} }
if (timeval > MINUTE) { if (timeval > MINUTE) {
mins = (timeval / MINUTE); mins = (timeval / MINUTE);
timeval -= (mins * MINUTE); timeval -= (mins * MINUTE);
if (mins > 1) if (mins > 0) {
pos += sprintf(timestr + pos, "%d minutes, ", mins); snprintf(timestr + offset, maxbytes, "%d minute%s, ", mins, ESS(mins));
else if (mins > 0) bytes = strlen(timestr + offset);
pos += sprintf(timestr + pos, "1 minute, "); offset += bytes;
maxbytes -= bytes;
}
} }
secs = timeval; secs = timeval;
if (secs > 0) if (secs > 0) {
pos += sprintf(timestr + pos, "%d seconds", secs); snprintf(timestr + offset, maxbytes, "%d second%s", secs, ESS(secs));
}
return timestr ? strdup(timestr) : NULL; return timestr ? strdup(timestr) : NULL;
} }
@ -657,25 +678,31 @@ static struct ast_cli_entry *find_cli(char *cmds[], int exact)
return e; return e;
} }
static void join(char *s, int len, char *w[]) static void join(char *dest, size_t destsize, char *w[])
{ {
int x; int x;
/* Join words into a string */ /* Join words into a string */
strcpy(s, ""); if (!dest || destsize < 1) {
return;
}
dest[0] = '\0';
for (x=0;w[x];x++) { for (x=0;w[x];x++) {
if (x) if (x)
strncat(s, " ", len - strlen(s)); strncat(dest, " ", destsize - strlen(dest) - 1);
strncat(s, w[x], len - strlen(s)); strncat(dest, w[x], destsize - strlen(dest) - 1);
} }
} }
static void join2(char *s, int len, char *w[]) static void join2(char *dest, size_t destsize, char *w[])
{ {
int x; int x;
/* Join words into a string */ /* Join words into a string */
strcpy(s, ""); if (!dest || destsize < 1) {
return;
}
dest[0] = '\0';
for (x=0;w[x];x++) { for (x=0;w[x];x++) {
strncat(s, w[x], len - strlen(s)); strncat(dest, w[x], destsize - strlen(dest) - 1);
} }
} }

15
enum.c
Unescape View File

@ -94,7 +94,7 @@ static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize
regmatch_t pmatch[9]; regmatch_t pmatch[9];
strcpy(dst, ""); dst[0] = '\0';
if (len < sizeof(struct naptr)) { if (len < sizeof(struct naptr)) {
ast_log(LOG_WARNING, "Length too short\n"); ast_log(LOG_WARNING, "Length too short\n");
@ -151,7 +151,7 @@ static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize
} }
/* DEDBUGGING STUB /* DEDBUGGING STUB
strcpy(regexp, "!^\\+43(.*)$!\\1@bla.fasel!"); strncpy(regexp, "!^\\+43(.*)$!\\1@bla.fasel!", sizeof(regexp) - 1);
*/ */
regexp_len = strlen(regexp); regexp_len = strlen(regexp);
@ -222,7 +222,8 @@ static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize
} }
} }
*d = 0; *d = 0;
strncpy(dst, temp, dstsize); strncpy(dst, temp, dstsize - 1);
dst[dstsize - 1] = '\0';
return 0; return 0;
} }
@ -245,8 +246,8 @@ static int txt_callback(void *context, u_char *answer, int len, u_char *fullansw
if (answer != NULL) { if (answer != NULL) {
c->txtlen = strlen(answer); c->txtlen = strlen(answer);
strncpy(c->txt, answer, 255); strncpy(c->txt, answer, sizeof(c->txt) - 1);
c->txt[c->txtlen] = 0; c->txt[sizeof(c->txt) - 1] = 0;
return 1; return 1;
} else { } else {
c->txt = NULL; c->txt = NULL;
@ -309,7 +310,7 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int ds
s = s->next; s = s->next;
} }
if (s) { if (s) {
strcpy(tmp + newpos, s->toplev); strncpy(tmp + newpos, s->toplev, sizeof(tmp) - newpos - 1);
} }
ast_mutex_unlock(&enumlock); ast_mutex_unlock(&enumlock);
if (!s) if (!s)
@ -368,7 +369,7 @@ int ast_get_txt(struct ast_channel *chan, const char *number, char *dst, int dst
s = s->next; s = s->next;
} }
if (s) { if (s) {
strcpy(tmp + newpos, s->toplev); strncpy(tmp + newpos, s->toplev, sizeof(tmp) - newpos - 1);
} }
ast_mutex_unlock(&enumlock); ast_mutex_unlock(&enumlock);
if (!s) if (!s)

11
file.c
Unescape View File

@ -279,14 +279,17 @@ static int copy(char *infile, char *outfile)
static char *build_filename(char *filename, char *ext) static char *build_filename(char *filename, char *ext)
{ {
char *fn; char *fn;
int fnsize = 0;
char tmp[AST_CONFIG_MAX_PATH]=""; char tmp[AST_CONFIG_MAX_PATH]="";
snprintf(tmp,sizeof(tmp)-1,"%s/%s",(char *)ast_config_AST_VAR_DIR,"sounds");
fn = malloc(strlen(tmp) + strlen(filename) + strlen(ext) + 10); snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_VAR_DIR, "sounds");
fnsize = strlen(tmp) + strlen(filename) + strlen(ext) + 10;
fn = malloc(fnsize);
if (fn) { if (fn) {
if (filename[0] == '/') if (filename[0] == '/')
sprintf(fn, "%s.%s", filename, ext); snprintf(fn, fnsize, "%s.%s", filename, ext);
else else
sprintf(fn, "%s/%s.%s", (char *)tmp, filename, ext); snprintf(fn, fnsize, "%s/%s.%s", tmp, filename, ext);
} }
return fn; return fn;

6
logger.c
Unescape View File

@ -211,7 +211,7 @@ static void init_logger_chain(void)
ast_mutex_lock(&loglock); ast_mutex_lock(&loglock);
if ((s = ast_variable_retrieve(cfg, "general", "dateformat"))) { if ((s = ast_variable_retrieve(cfg, "general", "dateformat"))) {
(void)strncpy(dateformat,s,sizeof(dateformat)); strncpy(dateformat, s, sizeof(dateformat) - 1);
} }
var = ast_variable_browse(cfg, "logfiles"); var = ast_variable_browse(cfg, "logfiles");
while(var) { while(var) {
@ -266,7 +266,7 @@ static void queue_log_init(void)
int reload_logger(int rotate) int reload_logger(int rotate)
{ {
char old[AST_CONFIG_MAX_PATH]; char old[AST_CONFIG_MAX_PATH] = "";
char new[AST_CONFIG_MAX_PATH]; char new[AST_CONFIG_MAX_PATH];
struct logchannel *f; struct logchannel *f;
FILE *myf; FILE *myf;
@ -307,7 +307,7 @@ int reload_logger(int rotate)
fclose(f->fileptr); fclose(f->fileptr);
f->fileptr = NULL; f->fileptr = NULL;
if(rotate) { if(rotate) {
strncpy(old, f->filename, sizeof(old)); strncpy(old, f->filename, sizeof(old) - 1);
for(x=0;;x++) { for(x=0;;x++) {
snprintf(new, sizeof(new), "%s.%d", f->filename, x); snprintf(new, sizeof(new), "%s.%d", f->filename, x);

6
manager.c
Unescape View File

@ -651,7 +651,7 @@ static int action_status(struct mansession *s, struct message *m)
if (c->bridge) if (c->bridge)
snprintf(bridge, sizeof(bridge), "Link: %s\r\n", c->bridge->name); snprintf(bridge, sizeof(bridge), "Link: %s\r\n", c->bridge->name);
else else
strcpy(bridge, ""); bridge[0] = '\0';
if (c->pbx) { if (c->pbx) {
ast_cli(s->fd, ast_cli(s->fd,
"Event: Status\r\n" "Event: Status\r\n"
@ -992,13 +992,13 @@ static int action_timeout(struct mansession *s, struct message *m)
static int process_message(struct mansession *s, struct message *m) static int process_message(struct mansession *s, struct message *m)
{ {
char action[80]; char action[80] = "";
struct manager_action *tmp = first_action; struct manager_action *tmp = first_action;
char *id = astman_get_header(m,"ActionID"); char *id = astman_get_header(m,"ActionID");
char idText[256] = ""; char idText[256] = "";
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
strncpy(action, astman_get_header(m, "Action"), sizeof(action)); strncpy(action, astman_get_header(m, "Action"), sizeof(action) - 1);
ast_log( LOG_DEBUG, "Manager received command '%s'\n", action ); ast_log( LOG_DEBUG, "Manager received command '%s'\n", action );
if (ast_strlen_zero(action)) { if (ast_strlen_zero(action)) {

22
muted.c
Unescape View File

@ -25,9 +25,9 @@
static char *config = "/etc/muted.conf"; static char *config = "/etc/muted.conf";
static char host[256]; static char host[256] = "";
static char user[256]; static char user[256] = "";
static char pass[256]; static char pass[256] = "";
static int smoothfade = 0; static int smoothfade = 0;
static int mutelevel = 20; static int mutelevel = 20;
static int muted = 0; static int muted = 0;
@ -98,17 +98,17 @@ static int load_config(void)
} }
if (!strcasecmp(buf, "host")) { if (!strcasecmp(buf, "host")) {
if (val && strlen(val)) if (val && strlen(val))
strncpy(host, val, sizeof(host)); strncpy(host, val, sizeof(host) - 1);
else else
fprintf(stderr, "host needs an argument (the host) at line %d\n", lineno); fprintf(stderr, "host needs an argument (the host) at line %d\n", lineno);
} else if (!strcasecmp(buf, "user")) { } else if (!strcasecmp(buf, "user")) {
if (val && strlen(val)) if (val && strlen(val))
strncpy(user, val, sizeof(user)); strncpy(user, val, sizeof(user) - 1);
else else
fprintf(stderr, "user needs an argument (the user) at line %d\n", lineno); fprintf(stderr, "user needs an argument (the user) at line %d\n", lineno);
} else if (!strcasecmp(buf, "pass")) { } else if (!strcasecmp(buf, "pass")) {
if (val && strlen(val)) if (val && strlen(val))
strncpy(pass, val, sizeof(pass)); strncpy(pass, val, sizeof(pass) - 1);
else else
fprintf(stderr, "pass needs an argument (the password) at line %d\n", lineno); fprintf(stderr, "pass needs an argument (the password) at line %d\n", lineno);
} else if (!strcasecmp(buf, "smoothfade")) { } else if (!strcasecmp(buf, "smoothfade")) {
@ -264,7 +264,7 @@ static struct channel *find_channel(char *channel)
char tmp[256] = ""; char tmp[256] = "";
char *s, *t; char *s, *t;
struct channel *chan; struct channel *chan;
strncpy(tmp, channel, sizeof(tmp)); strncpy(tmp, channel, sizeof(tmp) - 1);
s = strchr(tmp, '/'); s = strchr(tmp, '/');
if (s) { if (s) {
*s = '\0'; *s = '\0';
@ -460,15 +460,15 @@ static int wait_event(void)
return -1; return -1;
} }
if (!strncasecmp(resp, "Event: ", strlen("Event: "))) { if (!strncasecmp(resp, "Event: ", strlen("Event: "))) {
strncpy(event, resp + strlen("Event: "), sizeof(event)); strncpy(event, resp + strlen("Event: "), sizeof(event) - 1);
/* Consume the rest of the non-event */ /* Consume the rest of the non-event */
while((resp = get_line()) && strlen(resp)) { while((resp = get_line()) && strlen(resp)) {
if (!strncasecmp(resp, "Channel: ", strlen("Channel: "))) if (!strncasecmp(resp, "Channel: ", strlen("Channel: ")))
strncpy(channel, resp + strlen("Channel: "), sizeof(channel)); strncpy(channel, resp + strlen("Channel: "), sizeof(channel) - 1);
if (!strncasecmp(resp, "Newname: ", strlen("Newname: "))) if (!strncasecmp(resp, "Newname: ", strlen("Newname: ")))
strncpy(newname, resp + strlen("Newname: "), sizeof(newname)); strncpy(newname, resp + strlen("Newname: "), sizeof(newname) - 1);
if (!strncasecmp(resp, "Oldname: ", strlen("Oldname: "))) if (!strncasecmp(resp, "Oldname: ", strlen("Oldname: ")))
strncpy(oldname, resp + strlen("Oldname: "), sizeof(oldname)); strncpy(oldname, resp + strlen("Oldname: "), sizeof(oldname) - 1);
} }
if (strlen(channel)) { if (strlen(channel)) {
if (!strcasecmp(event, "Hangup")) if (!strcasecmp(event, "Hangup"))

139
pbx.c
Unescape View File

@ -875,7 +875,7 @@ static void pbx_substitute_variables_temp(struct ast_channel *c,const char *var,
} else } else
*ret = NULL; *ret = NULL;
} else if (c && !strcmp(var, "HINT")) { } else if (c && !strcmp(var, "HINT")) {
if (!ast_get_hint(workspace, workspacelen - 1, c, c->context, c->exten)) if (!ast_get_hint(workspace, workspacelen, c, c->context, c->exten))
*ret = NULL; *ret = NULL;
else else
*ret = workspace; *ret = workspace;
@ -908,12 +908,12 @@ static void pbx_substitute_variables_temp(struct ast_channel *c,const char *var,
strncpy(workspace, c->name, workspacelen - 1); strncpy(workspace, c->name, workspacelen - 1);
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "EPOCH")) { } else if (c && !strcmp(var, "EPOCH")) {
snprintf(workspace, workspacelen -1, "%u",(int)time(NULL)); snprintf(workspace, workspacelen, "%u",(int)time(NULL));
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "DATETIME")) { } else if (c && !strcmp(var, "DATETIME")) {
thistime=time(NULL); thistime=time(NULL);
localtime_r(&thistime, &brokentime); localtime_r(&thistime, &brokentime);
snprintf(workspace, workspacelen -1, "%02d%02d%04d-%02d:%02d:%02d", snprintf(workspace, workspacelen, "%02d%02d%04d-%02d:%02d:%02d",
brokentime.tm_mday, brokentime.tm_mday,
brokentime.tm_mon+1, brokentime.tm_mon+1,
brokentime.tm_year+1900, brokentime.tm_year+1900,
@ -926,7 +926,7 @@ static void pbx_substitute_variables_temp(struct ast_channel *c,const char *var,
thistime=time(NULL); thistime=time(NULL);
localtime_r(&thistime, &brokentime); localtime_r(&thistime, &brokentime);
/* 20031130-150612 */ /* 20031130-150612 */
snprintf(workspace, workspacelen -1, "%04d%02d%02d-%02d%02d%02d", snprintf(workspace, workspacelen, "%04d%02d%02d-%02d%02d%02d",
brokentime.tm_year+1900, brokentime.tm_year+1900,
brokentime.tm_mon+1, brokentime.tm_mon+1,
brokentime.tm_mday, brokentime.tm_mday,
@ -936,10 +936,10 @@ static void pbx_substitute_variables_temp(struct ast_channel *c,const char *var,
); );
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "UNIQUEID")) { } else if (c && !strcmp(var, "UNIQUEID")) {
snprintf(workspace, workspacelen -1, "%s", c->uniqueid); snprintf(workspace, workspacelen, "%s", c->uniqueid);
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "HANGUPCAUSE")) { } else if (c && !strcmp(var, "HANGUPCAUSE")) {
snprintf(workspace, workspacelen -1, "%i", c->hangupcause); snprintf(workspace, workspacelen, "%i", c->hangupcause);
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "ACCOUNTCODE")) { } else if (c && !strcmp(var, "ACCOUNTCODE")) {
strncpy(workspace, c->accountcode, workspacelen - 1); strncpy(workspace, c->accountcode, workspacelen - 1);
@ -1083,7 +1083,7 @@ void pbx_substitute_variables_helper(struct ast_channel *c,const char *cp1,char
} }
/* Retrieve variable value */ /* Retrieve variable value */
strcpy(workspace, ""); workspace[0] = '\0';
pbx_substitute_variables_temp(c,vars,&cp4, workspace, sizeof(workspace)); pbx_substitute_variables_temp(c,vars,&cp4, workspace, sizeof(workspace));
if (cp4) { if (cp4) {
length = strlen(cp4); length = strlen(cp4);
@ -1378,69 +1378,69 @@ int ast_extension_state(struct ast_channel *c, char *context, char *exten)
int ast_device_state_changed(const char *fmt, ...) int ast_device_state_changed(const char *fmt, ...)
{ {
struct ast_hint *list; struct ast_hint *list;
struct ast_state_cb *cblist; struct ast_state_cb *cblist;
char hint[AST_MAX_EXTENSION]; char hint[AST_MAX_EXTENSION] = "";
char device[AST_MAX_EXTENSION]; char device[AST_MAX_EXTENSION];
char *cur, *rest; char *cur, *rest;
int state; int state;
va_list ap;
va_start(ap, fmt); va_list ap;
vsnprintf(device, sizeof(device)-1, fmt, ap);
va_end(ap);
rest = strchr(device, '-'); va_start(ap, fmt);
if (rest) { vsnprintf(device, sizeof(device), fmt, ap);
*rest = 0; va_end(ap);
}
ast_mutex_lock(&hintlock);
list = hints; rest = strchr(device, '-');
if (rest) {
while (list) {
strcpy(hint, ast_get_extension_app(list->exten));
cur = hint;
do {
rest = strchr(cur, '&');
if (rest) {
*rest = 0; *rest = 0;
rest++; }
}
if (!strcmp(cur, device)) {
// Found extension execute callbacks
state = ast_extension_state2(list->exten);
if ((state != -1) && (state != list->laststate)) {
// For general callbacks
cblist = statecbs;
while (cblist) {
cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data);
cblist = cblist->next;
}
// For extension callbacks
cblist = list->callbacks;
while (cblist) {
cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data);
cblist = cblist->next;
}
list->laststate = state;
}
break;
}
cur = rest;
} while (cur);
list = list->next;
}
ast_mutex_unlock(&hintlock); ast_mutex_lock(&hintlock);
return 1;
list = hints;
while (list) {
strncpy(hint, ast_get_extension_app(list->exten), sizeof(hint) - 1);
cur = hint;
do {
rest = strchr(cur, '&');
if (rest) {
*rest = 0;
rest++;
}
if (!strcmp(cur, device)) {
// Found extension execute callbacks
state = ast_extension_state2(list->exten);
if ((state != -1) && (state != list->laststate)) {
// For general callbacks
cblist = statecbs;
while (cblist) {
cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data);
cblist = cblist->next;
}
// For extension callbacks
cblist = list->callbacks;
while (cblist) {
cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data);
cblist = cblist->next;
}
list->laststate = state;
}
break;
}
cur = rest;
} while (cur);
list = list->next;
}
ast_mutex_unlock(&hintlock);
return 1;
} }
int ast_extension_state_add(char *context, char *exten, int ast_extension_state_add(char *context, char *exten,
@ -1684,12 +1684,12 @@ static int ast_remove_hint(struct ast_exten *e)
} }
int ast_get_hint(char *hint, int maxlen, struct ast_channel *c, char *context, char *exten) int ast_get_hint(char *hint, int hintsize, struct ast_channel *c, char *context, char *exten)
{ {
struct ast_exten *e; struct ast_exten *e;
e = ast_hint_extension(c, context, exten); e = ast_hint_extension(c, context, exten);
if (e) { if (e) {
strncpy(hint, ast_get_extension_app(e), maxlen); strncpy(hint, ast_get_extension_app(e), hintsize - 1);
return -1; return -1;
} }
return 0; return 0;
@ -1907,7 +1907,8 @@ int ast_pbx_run(struct ast_channel *c)
ast_log(LOG_WARNING, "Don't know what to do with '%s'\n", c->name); ast_log(LOG_WARNING, "Don't know what to do with '%s'\n", c->name);
out: out:
if ((res != AST_PBX_KEEPALIVE) && ast_exists_extension(c, c->context, "h", 1, c->callerid)) { if ((res != AST_PBX_KEEPALIVE) && ast_exists_extension(c, c->context, "h", 1, c->callerid)) {
strcpy(c->exten, "h"); c->exten[0] = 'h';
c->exten[1] = '\0';
c->priority = 1; c->priority = 1;
while(ast_exists_extension(c, c->context, c->exten, c->priority, c->callerid)) { while(ast_exists_extension(c, c->context, c->exten, c->priority, c->callerid)) {
if ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->callerid))) { if ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->callerid))) {
@ -3696,7 +3697,7 @@ int ast_add_extension2(struct ast_context *con,
ext_strncpy(tmp->cidmatch, callerid, sizeof(tmp->cidmatch)); ext_strncpy(tmp->cidmatch, callerid, sizeof(tmp->cidmatch));
tmp->matchcid = 1; tmp->matchcid = 1;
} else { } else {
strcpy(tmp->cidmatch, ""); tmp->cidmatch[0] = '\0';
tmp->matchcid = 0; tmp->matchcid = 0;
} }
strncpy(tmp->app, application, sizeof(tmp->app)-1); strncpy(tmp->app, application, sizeof(tmp->app)-1);

4
srv.c
Unescape View File

@ -60,7 +60,7 @@ static int parse_srv(unsigned char *host, int hostlen, int *portno, unsigned cha
if (res && strcmp(repl, ".")) { if (res && strcmp(repl, ".")) {
ast_verbose( VERBOSE_PREFIX_3 "parse_srv: SRV mapped to host %s, port %d\n", repl, ntohs(srv->portnum)); ast_verbose( VERBOSE_PREFIX_3 "parse_srv: SRV mapped to host %s, port %d\n", repl, ntohs(srv->portnum));
if (host) { if (host) {
strncpy(host, repl, hostlen - 2); strncpy(host, repl, hostlen - 1);
host[hostlen-1] = '\0'; host[hostlen-1] = '\0';
} }
if (portno) if (portno)
@ -109,7 +109,7 @@ int ast_get_srv(struct ast_channel *chan, char *host, int hostlen, int *port, co
ret |= ast_autoservice_stop(chan); ret |= ast_autoservice_stop(chan);
if (ret <= 0) { if (ret <= 0) {
strcpy(host, ""); host[0] = '\0';
*port = -1; *port = -1;
return ret; return ret;
} }

4
translate.c
Unescape View File

@ -351,7 +351,9 @@ static int show_translation(int fd, int argc, char *argv[])
ast_cli(fd, " Source Format (Rows) Destination Format(Columns)\n\n"); ast_cli(fd, " Source Format (Rows) Destination Format(Columns)\n\n");
ast_mutex_lock(&list_lock); ast_mutex_lock(&list_lock);
for (x=-1;x<SHOW_TRANS; x++) { for (x=-1;x<SHOW_TRANS; x++) {
strcpy(line, " "); /* next 2 lines run faster than using strcpy() */
line[0] = ' ';
line[1] = '\0';
for (y=-1;y<SHOW_TRANS;y++) { for (y=-1;y<SHOW_TRANS;y++) {
if (x >= 0 && y >= 0 && tr_matrix[x][y].step) if (x >= 0 && y >= 0 && tr_matrix[x][y].step)
snprintf(line + strlen(line), sizeof(line) - strlen(line), " %5d", tr_matrix[x][y].cost >= 99999 ? tr_matrix[x][y].cost-99999 : tr_matrix[x][y].cost); snprintf(line + strlen(line), sizeof(line) - strlen(line), " %5d", tr_matrix[x][y].cost >= 99999 ? tr_matrix[x][y].cost-99999 : tr_matrix[x][y].cost);

Write Preview
Loading…
Cancel
Save