svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/mysql/php_mysql.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysql/php_mysql.c
trunk/ext/mysql/php_mysql.c
| From: | Kalle Sommer Nielsen | Date: | Wed, 18 Aug 2010 20:00:18 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/mysql/php_mysql.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63329@lists.php.net to get a copy of this message | ||
kalle Wed, 18 Aug 2010 20:00:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302456
Log:
Fixed bug #52636 (php_mysql_fetch_hash writes long value into int)
# Tested by rein at basefarm dot no
Bug: http://bugs.php.net/52636 (Assigned)
php_mysql_fetch_hash writes long value into int
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U php/php-src/trunk/ext/mysql/php_mysql.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2010-08-18 19:29:58 UTC (rev 302455)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-08-18 20:00:18 UTC (rev 302456)
@@ -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).
Modified: php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c 2010-08-18 19:29:58 UTC (rev 302455)
+++ php/php-src/branches/PHP_5_2/ext/mysql/php_mysql.c 2010-08-18 20:00:18 UTC (rev 302456)
@@ -1884,7 +1884,7 @@
/* {{{ 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;
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-08-18 19:29:58 UTC (rev 302455)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-08-18 20:00:18 UTC (rev 302456)
@@ -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).
Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-08-18 19:29:58 UTC (rev 302455)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-08-18 20:00:18 UTC (rev 302456)
@@ -2006,7 +2006,7 @@
/* {{{ 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;
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2010-08-18 19:29:58 UTC (rev 302455)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-08-18 20:00:18 UTC (rev 302456)
@@ -2008,7 +2008,7 @@
/* {{{ 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;