Only in php-4.0.6.ORIG/Zend: zend_alloc.2.c
Only in php-4.0.6.ORIG/Zend: zend_alloc.2.c~
Only in php-4.0.6.ORIG/: cgi_build
Only in php-4.0.6.ORIG/ext/bcmath: number.c
Only in php-4.0.6.ORIG/ext/bcmath: number.h
diff -ur php-4.0.6.ORIG/ext/odbc/php_odbc.c php-4.0.6/ext/odbc/php_odbc.c
--- php-4.0.6.ORIG/ext/odbc/php_odbc.c Tue Jun 19 19:55:00 2001
+++ php-4.0.6/ext/odbc/php_odbc.c Thu Aug 2 09:13:00 2001
@@ -565,6 +565,7 @@
{
RETCODE rc;
int i;
+ long _size=0;
SWORD colnamelen; /* Not used */
SDWORD displaysize;
ODBCLS_FETCH();
@@ -610,11 +611,18 @@
break;
#endif /* HAVE_ADABAS */
default:
+ _size = result->longreadlen;
rc = SQLColAttributes(result->stmt, (UWORD)(i+1), SQL_COLUMN_DISPLAY_SIZE,
NULL, 0, NULL, &displaysize);
- 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);
+ _size = (_size <= displaysize ? _size : displaysize);
+ result->values[i].value = (char *)emalloc(_size + 1);
+ if (result->values[i].value) {
+ rc = SQLBindCol(result->stmt, (UWORD)(i+1), SQL_C_CHAR,
+ result->values[i].value, _size + 1,
+ &result->values[i].vallen);
+ } else {
+ return 0;
+ }
break;
}
}
Only in php-4.0.6/ext/odbc: php_odbc.c~
Only in php-4.0.6.ORIG/: mod_build
--- php-4.0.6.ORIG/ext/odbc/php_odbc.c Tue Jun 19 19:55:00 2001
+++ php-4.0.6/ext/odbc/php_odbc.c Mon Jul 30 12:31:33 2001
@@ -363,7 +363,7 @@
le_pconn = zend_register_list_destructors_ex(NULL, _close_odbc_pconn, "odbc link persistent", module_number);
odbc_module_entry.type = type;
- REGISTER_STRING_CONSTANT("ODBC_TYPE", PHP_ODBC_TYPE, CONST_CS | CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT("ODBC_TYPE", estrdup (PHP_ODBC_TYPE), CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ODBC_BINMODE_RETURN", 1, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ODBC_BINMODE_CONVERT", 2, CONST_CS | CONST_PERSISTENT);
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
