From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 21 Mar 2006 15:35:28 +0000 (+0000)
Subject: Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
X-Git-Tag: php-5.1.3RC2~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d76e149f0ee45f0bc69f385ad1b083dba09995ce;p=php

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

diff --git a/NEWS b/NEWS
index 3130d19a67..0fa2328853 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP                                                                        NEWS
 - Fixed debug_zval_dump() to support private and protected members. (Dmitry)
 - Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
 - Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony)
+- Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
+  (Ilia)
 - Fixed bug #36721 (The SoapServer is not able to send a header that it didn't
   receive). (Dmitry)
 - Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 99a3f03023..9c031fab6c 100644
--- 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;