diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-10 05:54:53 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-10 05:54:53 +0000 |
| commit | 781b6a189e05826584db5c643650cfee318c8a9a (patch) | |
| tree | 0e95e4b1800c167cd8dbce22126aba0c5df80a46 /funcs/func_odbc.c | |
| parent | cb8c826815fb2f0fa630119a308c24828046ec5d (diff) | |
Merged revisions 310142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r310142 | tilghman | 2011-03-09 23:53:29 -0600 (Wed, 09 Mar 2011) | 19 lines
Merged revisions 310141 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r310141 | tilghman | 2011-03-09 23:51:37 -0600 (Wed, 09 Mar 2011) | 12 lines
Merged revisions 310140 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r310140 | tilghman | 2011-03-09 23:38:44 -0600 (Wed, 09 Mar 2011) | 5 lines
Initialize column size to 0 to deal with a potential UnixODBC bug on 64-bit systems.
(closes issue #18295)
Reported by: pruiz
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@310143 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_odbc.c')
| -rw-r--r-- | funcs/func_odbc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 8ba91da1b..10cf50e83 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -589,7 +589,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha if (y == 0) { char colname[256]; - SQLULEN maxcol; + SQLULEN maxcol = 0; res = SQLDescribeCol(stmt, x + 1, (unsigned char *)colname, sizeof(colname), &collength, NULL, &maxcol, NULL, NULL); ast_debug(3, "Got collength of %d and maxcol of %d for column '%s' (offset %d)\n", (int)collength, (int)maxcol, colname, x); @@ -1197,6 +1197,8 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args } for (;;) { for (x = 0; x < colcount; x++) { + maxcol = 0; + res = SQLDescribeCol(stmt, x + 1, (unsigned char *)colname, sizeof(colname), &collength, NULL, &maxcol, NULL, NULL); if (((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) || collength == 0) { snprintf(colname, sizeof(colname), "field%d", x); |