From eafdcbacd46cabaa304e63e97de02f62390a49eb Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 10 Mar 2011 05:38:44 +0000
Subject: [PATCH] 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/branches/1.4@310140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_voicemail.c  | 1 +
 res/res_config_odbc.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 71bdbb45d6..f8948faf6d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2473,6 +2473,7 @@ static int retrieve_file(char *dir, int msgnum)
 			fprintf(f, "[message]\n");
 		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);
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 52913507d4..cb389bafd1 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -223,6 +223,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);
@@ -377,6 +378,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);
-- 
2.47.2