diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-25 14:44:50 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-25 14:44:50 +0000 |
commit | 749029de38e8b8c02172912917e2642b8c96547c (patch) | |
tree | a306715b687622ba9fa6548dc30e79f9c1e1b057 /channels/chan_nbs.c | |
parent | c30f1d12c504a8f96d6773ce2dbae8327d140b7a (diff) |
Merged revisions 46200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46200 | kpfleming | 2006-10-25 09:32:08 -0500 (Wed, 25 Oct 2006) | 2 lines
apparently developers are still not aware that they should be use ast_copy_string instead of strncpy... fix up many more users, and fix some bugs in the process
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_nbs.c')
-rw-r--r-- | channels/chan_nbs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 340ed2475..8cf72fb43 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -129,10 +129,10 @@ static struct nbs_pvt *nbs_alloc(void *data) { struct nbs_pvt *p; int flags = 0; - char stream[256] = ""; + char stream[256]; char *opts; - strncpy(stream, data, sizeof(stream) - 1); + ast_copy_string(stream, data, sizeof(stream)); if ((opts = strchr(stream, ':'))) { *opts = '\0'; opts++; @@ -153,7 +153,7 @@ static struct nbs_pvt *nbs_alloc(void *data) } else flags = NBS_FLAG_OVERSPEAK; - strncpy(p->stream, stream, sizeof(p->stream) - 1); + ast_copy_string(p->stream, stream, sizeof(p->stream)); p->nbs = nbs_newstream("asterisk", stream, flags); if (!p->nbs) { ast_log(LOG_WARNING, "Unable to allocate new NBS stream '%s' with flags %d\n", stream, flags); @@ -247,8 +247,8 @@ static struct ast_channel *nbs_new(struct nbs_pvt *i, int state) if (state == AST_STATE_RING) tmp->rings = 1; tmp->tech_pvt = i; - strncpy(tmp->context, context, sizeof(tmp->context)-1); - strncpy(tmp->exten, "s", sizeof(tmp->exten) - 1); + ast_copy_string(tmp->context, context, sizeof(tmp->context)); + ast_copy_string(tmp->exten, "s", sizeof(tmp->exten)); ast_string_field_set(tmp, language, ""); i->owner = tmp; i->u = ast_module_user_add(tmp); |