diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2001-10-18 16:47:57 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2001-10-18 16:47:57 +0000 |
commit | 3b0ed1ec21c33db5533265e3f0339074324e2817 (patch) | |
tree | e6f64a0d6ef32dc8598367c752db154a16cf3a4b /channels/chan_oss.c | |
parent | 45ac69512b3210e5e4bd6e0b5c66d615f7b47c4e (diff) |
Version 0.1.10 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@376 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
-rwxr-xr-x | channels/chan_oss.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index fab41ed14..3959cda13 100755 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -727,11 +727,11 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *p, int state) tmp->pvt->indicate = oss_indicate; tmp->pvt->fixup = oss_fixup; if (strlen(p->context)) - strncpy(tmp->context, p->context, sizeof(tmp->context)); + strncpy(tmp->context, p->context, sizeof(tmp->context)-1); if (strlen(p->exten)) - strncpy(tmp->exten, p->exten, sizeof(tmp->exten)); + strncpy(tmp->exten, p->exten, sizeof(tmp->exten)-1); if (strlen(language)) - strncpy(tmp->language, language, sizeof(tmp->language)); + strncpy(tmp->language, language, sizeof(tmp->language)-1); p->owner = tmp; tmp->state = state; ast_pthread_mutex_lock(&usecnt_lock); @@ -895,7 +895,7 @@ static int console_dial(int fd, int argc, char *argv[]) mye = exten; myc = context; if (argc == 2) { - strncpy(tmp, argv[1], sizeof(tmp)); + strncpy(tmp, argv[1], sizeof(tmp)-1); strtok(tmp, "@"); tmp2 = strtok(NULL, "@"); if (strlen(tmp)) @@ -904,8 +904,8 @@ static int console_dial(int fd, int argc, char *argv[]) myc = tmp2; } if (ast_exists_extension(NULL, myc, mye, 1, NULL)) { - strncpy(oss.exten, mye, sizeof(oss.exten)); - strncpy(oss.context, myc, sizeof(oss.context)); + strncpy(oss.exten, mye, sizeof(oss.exten)-1); + strncpy(oss.context, myc, sizeof(oss.context)-1); hookstate = 1; oss_new(&oss, AST_STATE_UP); } else @@ -972,11 +972,11 @@ int load_module() else if (!strcasecmp(v->name, "silencethreshold")) silencethreshold = atoi(v->value); else if (!strcasecmp(v->name, "context")) - strncpy(context, v->value, sizeof(context)); + strncpy(context, v->value, sizeof(context)-1); else if (!strcasecmp(v->name, "language")) - strncpy(language, v->value, sizeof(language)); + strncpy(language, v->value, sizeof(language)-1); else if (!strcasecmp(v->name, "extension")) - strncpy(exten, v->value, sizeof(exten)); + strncpy(exten, v->value, sizeof(exten)-1); v=v->next; } ast_destroy(cfg); |