From 07757b4f2f4a45841fe825eb16f99ffd37512246 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Fri, 25 Sep 2009 11:38:19 +0000 Subject: [PATCH] Fix a crash in the rare case when a persistent connection is found dead, after CHNG_USER. mysql->mysql will be NULL and segfault will follow. --- ext/mysqli/mysqli_nonapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 1237458d27..2ed19ae2d4 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -216,7 +216,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne MyG(num_active_persistent) + MyG(num_inactive_persistent)); goto err; } - if (!is_real_connect && !mysql->mysql) { + if (!mysql->mysql) { #if !defined(MYSQLI_USE_MYSQLND) if (!(mysql->mysql = mysql_init(NULL))) { #else -- 2.50.1