iliaa Thu Aug 14 10:37:33 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/odbc php_odbc.c
/php-src NEWS
Log:
MFH: Fixed bug #25081 (odbc_fetch_array() may mangle numeric fields).
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.14 php-src/ext/odbc/php_odbc.c:1.143.2.15
--- php-src/ext/odbc/php_odbc.c:1.143.2.14 Sun Aug 10 22:08:32 2003
+++ php-src/ext/odbc/php_odbc.c Thu Aug 14 10:37:33 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.143.2.14 2003/08/11 02:08:32 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.15 2003/08/14 14:37:33 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1459,8 +1459,13 @@
if (result_type & ODBC_NUM) {
zend_hash_index_update(Z_ARRVAL_P(return_value), i, &tmp,
sizeof(pval *), NULL);
} else {
- zend_hash_update(Z_ARRVAL_P(return_value),
result->values[i].name,
+ if (!*(result->values[i].name)) {
+ zend_hash_update(Z_ARRVAL_P(return_value),
Z_STRVAL_P(tmp),
+ Z_STRLEN_P(tmp)+1, &tmp, sizeof(pval *), NULL);
+ } else {
+ zend_hash_update(Z_ARRVAL_P(return_value),
result->values[i].name,
strlen(result->values[i].name)+1, &tmp,
sizeof(pval *), NULL);
+ }
}
}
if (buf) efree(buf);
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.347 php-src/NEWS:1.1247.2.348
--- php-src/NEWS:1.1247.2.347 Wed Aug 13 21:32:02 2003
+++ php-src/NEWS Thu Aug 14 10:37:33 2003
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Aug 2003, Version 4.3.3RC4
- Fixed bug #25084 (Make refer check not dependant on register_globals). (Ilia)
+- Fixed bug #25081 (odbc_fetch_array() may mangle numeric fields). (Ilia)
- Fixed bug #25044 (header("Location:") changing HTTP status). (Marcus)
- Fixed bug #25037 (Possible infinite loop inside SendText()). (Ilia)
- Fixed bug #25007 (rand() & mt_rand() seed RNG every call). (Jani)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
