diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-18 20:00:18 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-18 20:00:18 +0000 |
| commit | c2c3467ab46d7da8a28ef01c17e4c0877100ac8b (patch) | |
| tree | 77223daf62b859f72ead8c78a7d169f233273af2 | |
| parent | 2fb2f81538704fc6c09173e3843f22aa6b3d04fc (diff) | |
| download | php-git-c2c3467ab46d7da8a28ef01c17e4c0877100ac8b.tar.gz | |
Fixed bug #52636 (php_mysql_fetch_hash writes long value into int)
# Tested by rein at basefarm dot no
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -11,6 +11,8 @@ (Kalle) - Changed the $context parameter on copy() to actually have an effect. (Kalle) +- Fixed bug #52636 (php_mysql_fetch_hash writes long value into int). + (Kalle, rein at basefarm dot no) - Fixed bug #52613 (crash in mysqlnd after hitting memory limit). (Andrey) - Fixed bug #52573 (SplFileObject::fscanf Segmentation fault). (Felipe) - Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values). diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 32d840c17e..ab1d2a001e 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -2006,7 +2006,7 @@ PHP_FUNCTION(mysql_num_fields) /* {{{ php_mysql_fetch_hash */ -static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int expected_args, int into_object) +static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int expected_args, int into_object) { MYSQL_RES *mysql_result; zval *res, *ctor_params = NULL; |