diff options
author | jpeeler <jpeeler@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-02-15 23:33:44 +0000 |
---|---|---|
committer | jpeeler <jpeeler@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-02-15 23:33:44 +0000 |
commit | 890f4784c1483bbf9d4fbc83d9dd210b5b93d43e (patch) | |
tree | a6e737a6434cb08ac4cbb9cde4f38e0ea98d7c01 /ztcfg.c | |
parent | c1cbe89ec4051c38ec600cc8b4cc0ed0deb10bb4 (diff) |
Fixes bug 11471. Replaced all instances of strncpy with zap_copy_string (added to zaptel.h) to fix any off by one errors and ensure destination string is NULL terminated.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3833 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'ztcfg.c')
-rw-r--r-- | ztcfg.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -256,8 +256,8 @@ int dspanconfig(char *keyword, char *args) } - strncpy(zds[numdynamic].driver, realargs[0], sizeof(zds[numdynamic].driver)); - strncpy(zds[numdynamic].addr, realargs[1], sizeof(zds[numdynamic].addr)); + zap_copy_string(zds[numdynamic].driver, realargs[0], sizeof(zds[numdynamic].driver)); + zap_copy_string(zds[numdynamic].addr, realargs[1], sizeof(zds[numdynamic].addr)); zds[numdynamic].numchans = chans; zds[numdynamic].timing = timing; @@ -365,7 +365,7 @@ int apply_channels(int chans[], char *argstr) for (x=0;x<res;x++) { if (strchr(args[x], '-')) { /* It's a range */ - strncpy(argcopy, args[x], sizeof(argcopy)); + zap_copy_string(argcopy, args[x], sizeof(argcopy)); res2 = parseargs(argcopy, range, 2, '-'); if (res2 != 2) { error("Syntax error in range '%s'. Should be <val1>-<val2>.\n", args[x]); @@ -612,7 +612,7 @@ static int registerzone(char *keyword, char *args) error("Too many tone zones specified\n"); return 0; } - strncpy(zonestoload[numzones++], args, sizeof(zonestoload[0])); + zap_copy_string(zonestoload[numzones++], args, sizeof(zonestoload[0])); return 0; } @@ -868,7 +868,7 @@ int rad_apply_channels(int chans[], char *argstr) for (x=0;x<res;x++) { if (strchr(args[x], '-')) { /* It's a range */ - strncpy(argcopy, args[x], sizeof(argcopy)); + zap_copy_string(argcopy, args[x], sizeof(argcopy)); res2 = parseargs(argcopy, range, 2, '-'); if (res2 != 2) { error("Syntax error in range '%s'. Should be <val1>-<val2>.\n", args[x]); |