From 31824b2c0451932ec120c8cc231cd3618e6b81d3 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Wed, 18 Aug 2010 20:00:18 +0000 Subject: Fixed bug #52636 (php_mysql_fetch_hash writes long value into int) # Tested by rein at basefarm dot no --- NEWS | 2 ++ ext/mysql/php_mysql.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ca2d1e85ed..5cba79da92 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,8 @@ PDOStatement if instantiated directly instead of doing by the PDO methods. (Felipe) +- Fixed bug #52636 (php_mysql_fetch_hash writes long value into int). + (Kalle, rein at basefarm dot no) - Fixed bug #52317 (Segmentation fault when using mail() on a rhel 4.x (only 64 bit)). (Adam) - Fixed bug #52238 (Crash when an Exception occured in iterator_to_array). diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index c276e76a8b..c102a8e398 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1884,7 +1884,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) { zval **result, **arg2; MYSQL_RES *mysql_result; -- cgit v1.2.1