From: Evan Hunt <each@isc.org>
Date: Fri, 7 Feb 2014 04:05:25 +0000 (-0800)
Subject: [master] type mismatch in ODBC DLZ driver
X-Git-Tag: v9.10.0b1~147^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41e55d04032c0eefd39d74ffb73657b04fb821ec;p=thirdparty%2Fbind9.git

[master] type mismatch in ODBC DLZ driver

3732.	[contrib]	Fixed a type mismatch causing the ODBC DLZ
			driver to dump core on 64-bit systems. [RT #35324]
---

diff --git a/CHANGES b/CHANGES
index c596182538e..f71fb1e14d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3732.	[contrib]	Fixed a type mismatch causing the ODBC DLZ
+			driver to dump core on 64-bit systems. [RT #35324]
+
 3731.	[func]		Added a "no-case-compress" ACL, which causes
 			named to use case-insensitive compression
 			(disabling change #3645) for specified
diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c
index 283998d85eb..75ac3ca3c81 100644
--- a/contrib/dlz/drivers/dlz_odbc_driver.c
+++ b/contrib/dlz/drivers/dlz_odbc_driver.c
@@ -734,7 +734,7 @@ odbc_get_resultset(const char *zone, const char *record,
 static isc_result_t
 odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) {
 
-	SQLINTEGER size;
+	SQLLEN size;
 
 	REQUIRE(data != NULL && *data == NULL);
 
@@ -763,7 +763,7 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField,
 		   SQLSMALLINT endField, char **retData) {
 
 	isc_result_t result;
-	SQLINTEGER size;
+	SQLLEN size;
 	int totSize = 0;
 	SQLSMALLINT i;
 	int j = 0;