andrey Tue, 25 May 2010 22:55:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299764
Log:
Handle the situation when mysql_init()/mysqlnd_init()
return NULL. It is a rare case of OOM but PHP shouldn't crash, if possible.
Changed paths:
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_3/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-05-25 22:46:17 UTC
(rev 299763)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-05-25 22:55:10 UTC
(rev 299764)
@@ -960,9 +960,17 @@
#else
mysql->conn = mysql_init(persistent);
#endif
+ if (!mysql->conn) {
+ MySG(connect_error) = estrdup("OOM");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "OOM");
+ efree(hashed_details);
+ efree(mysql);
+ MYSQL_DO_CONNECT_RETURN_FALSE();
+ }
- if (connect_timeout != -1)
- mysql_options(mysql->conn,
MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
+ if (connect_timeout != -1) {
+ mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT,
(const char *)&connect_timeout);
+ }
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd, NULL,
port, socket, client_flags)==NULL)
Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===================================================================
--- php/php-src/trunk/ext/mysql/php_mysql.c 2010-05-25 22:46:17 UTC (rev
299763)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-05-25 22:55:10 UTC (rev
299764)
@@ -960,9 +960,17 @@
#else
mysql->conn = mysql_init(persistent);
#endif
+ if (!mysql->conn) {
+ MySG(connect_error) = estrdup("OOM");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "OOM");
+ efree(hashed_details);
+ efree(mysql);
+ MYSQL_DO_CONNECT_RETURN_FALSE();
+ }
- if (connect_timeout != -1)
- mysql_options(mysql->conn,
MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
+ if (connect_timeout != -1) {
+ mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT,
(const char *)&connect_timeout);
+ }
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd, NULL,
port, socket, client_flags)==NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
