From 67c91388dbcec406a3957c8c629c19a18322b072 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 10 Mar 2011 05:54:53 +0000 Subject: 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: https://origsvn.digium.com/svn/asterisk/trunk@310143 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_config_odbc.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'res/res_config_odbc.c') 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