[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c trunk/ext/pdo_mysql/pdo_mysql.c

[Andrey Hristov]

andrey                                   Wed, 05 Oct 2011 18:51:15 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=317803

Log:
Fix bad cast which leads to crashes!

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
    U   php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c

Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c      2011-10-05 
18:23:16 UTC (rev 317802)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c      2011-10-05 
18:51:15 UTC (rev 317803)
@@ -58,7 +58,7 @@
                        return NULL;
                }

-               return ((pdo_mysql_db_handle *)dbh)->server;
+               return ((pdo_mysql_db_handle *)dbh->driver_data)->server;
        }
        return NULL;
 }

Modified: php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-10-05 18:23:16 UTC (rev 
317802)
+++ php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c 2011-10-05 18:51:15 UTC (rev 
317803)
@@ -58,7 +58,7 @@
                        return NULL;
                }

-               return ((pdo_mysql_db_handle *)dbh)->server;
+               return ((pdo_mysql_db_handle *)dbh->driver_data)->server;
        }
        return NULL;
 }


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php