From: Dan Kalowsky <kalowsky@php.net>
Date: Wed, 5 Sep 2001 16:19:48 +0000 (+0000)
Subject: Patch to stop the crashing behavior exhibited by PHP/ODBC in SOLID/DB2
X-Git-Tag: PRE_SUBST_Z_MACROS~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24b54b866fc36fed094c1f455e0174c99c24ee40;p=php

Patch to stop the crashing behavior exhibited by PHP/ODBC in SOLID/DB2
submitted by Walter Franzini (walter@sys-net.it)
@Fix for LONG_VARCHAR type crashing submitted by Walter Franzini (walter@sys-net.it)
#Should this also be put into the 4.0.7 RC cycle?
---

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 4fdde9db5f..274574b8a7 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -615,6 +615,8 @@ int odbc_bindcols(odbc_result *result TSRMLS_DC)
 			default:
 				rc = SQLColAttributes(result->stmt, (UWORD)(i+1), SQL_COLUMN_DISPLAY_SIZE,
 									NULL, 0, NULL, &displaysize);
+				displaysize = displaysize <= result->longreadlen ? displaysize : 
+								result->longreadlen;
 				result->values[i].value = (char *)emalloc(displaysize + 1);
 				rc = SQLBindCol(result->stmt, (UWORD)(i+1), SQL_C_CHAR, result->values[i].value,
 							displaysize + 1, &result->values[i].vallen);