diff options
| author | Andrey Hristov <andrey@php.net> | 2010-05-25 22:55:10 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-05-25 22:55:10 +0000 |
| commit | bccf2cea5dc8084119382bd5f1ec0abfad223551 (patch) | |
| tree | 2db78d12fbbf3c09d964b071829021b29b2a9e82 /ext/mysql/php_mysql.c | |
| parent | f3009cb59604bfe0281153f64caa9d113444c54d (diff) | |
| download | php-git-bccf2cea5dc8084119382bd5f1ec0abfad223551.tar.gz | |
Handle the situation when mysql_init()/mysqlnd_init()
return NULL. It is a rare case of OOM but PHP shouldn't crash, if possible.
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 7838df2d07..d63fe13db1 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -960,9 +960,17 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #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) |