MFB51: Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 99a3f0302385dc02b3526076e7a6fcba13d6088c..9c031fab6c487b6ac9ab8ccf5ae68e9c75943167 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -326,7 +326,7 @@ PHP_FUNCTION(mysqli_set_charset)
        }
        MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, "mysqli_link");
 
-       if (mysql_set_character_set(mysql->mysql, cs_name)) {
+       if (!mysql->mysql->thread_id || mysql_set_character_set(mysql->mysql, cs_name)) {
                RETURN_FALSE;
        }
        RETURN_TRUE;