diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-07 06:54:47 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-07 06:54:47 +0000 |
commit | 8718878490016dbc64c36bc25e695672debf79d3 (patch) | |
tree | 3f8307275224caab3a5ba9fae26b4eebf54ab4cf /funcs/func_odbc.c | |
parent | 5fa773a9f95727e11fc3f175fa456fdcfe3564bf (diff) |
Merged revisions 106552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r106552 | tilghman | 2008-03-07 00:36:33 -0600 (Fri, 07 Mar 2008) | 6 lines
Safely use the strncat() function.
(closes issue #11958)
Reported by: norman
Patches:
20080209__bug11958.diff.txt uploaded by Corydon76 (license 14)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_odbc.c')
-rw-r--r-- | funcs/func_odbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index fe7e9896d..13701873f 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -379,7 +379,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha } if (!ast_strlen_zero(colnames)) - strncat(colnames, ",", sizeof(colnames) - 1); + strncat(colnames, ",", sizeof(colnames) - strlen(colnames) - 1); namelen = strlen(colnames); /* Copy data, encoding '\' and ',' for the argument parser */ |