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 /res/res_config_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 'res/res_config_odbc.c')
-rw-r--r-- | res/res_config_odbc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index c076555fa..b31241235 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -238,6 +238,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl } for (x = 0; x < colcount; x++) { rowdata[0] = '\0'; + colsize = 0; collen = sizeof(coltitle); res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen, &datatype, &colsize, &decimaldigits, &nullable); @@ -410,6 +411,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char * } for (x=0;x<colcount;x++) { rowdata[0] = '\0'; + colsize = 0; collen = sizeof(coltitle); res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen, &datatype, &colsize, &decimaldigits, &nullable); |