summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2011-05-18 11:49:49 +0000
committerJohannes Schlüter <johannes@php.net>2011-05-18 11:49:49 +0000
commit0a17fe52fb2f17996413b05339989dc874c08f8f (patch)
tree405da5c315c503a3283ccb0cf5b23d5cc8bf561a /ext/mysql/php_mysql.c
parent4b450a0f85b2dc69e4260f374fab96af64587f4d (diff)
downloadphp-git-0a17fe52fb2f17996413b05339989dc874c08f8f.tar.gz
- handle out of memory
Diffstat (limited to 'ext/mysql/php_mysql.c')
-rw-r--r--ext/mysql/php_mysql.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index ddd8d22ee2..df9dac549b 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -830,6 +830,9 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
}
/* create the link */
mysql = (php_mysql_conn *) malloc(sizeof(php_mysql_conn));
+ if (!mysql) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Out of memory while allocating memory for a persistent link");
+ }
mysql->active_result_id = 0;
#ifdef CLIENT_MULTI_STATEMENTS
mysql->multi_query = client_flags & CLIENT_MULTI_STATEMENTS? 1:0;