cvs: php4 /ext/odbc php_odbc.c

kalowsky Wed Sep 5 12:19:48 2001 EDT Modified files: /php4/ext/odbc php_odbc.c Log: 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? Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.107 php4/ext/odbc/php_odbc.c:1.108 --- php4/ext/odbc/php_odbc.c:1.107 Mon Aug 13 12:13:18 2001 +++ php4/ext/odbc/php_odbc.c Wed Sep 5 12:19:48 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.107 2001/08/13 16:13:18 andi Exp $ */ +/* $Id: php_odbc.c,v 1.108 2001/09/05 16:19:48 kalowsky Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -615,6 +615,8 @@ 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);