From: Juan Basso <jrbasso@gmail.com>
Date: Tue, 10 Mar 2015 04:01:26 +0000 (-0400)
Subject: Renamed test case to match with reported bug
X-Git-Tag: php-5.6.8RC1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e7f47cb039fd8803776eaf2899d576c503cdb63;p=php

Renamed test case to match with reported bug
---

diff --git a/NEWS b/NEWS
index 2effd62701..8bebcd3eee 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP                                                                        NEWS
   . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
     configuration options). (Anatol Belski)
   . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas)
+  . Fixed bug #69210 (serialize function return corrupted data when sleep has
+    non-string values). (Juan Basso)
   . Fixed bug #69212 (Leaking VIA_HANDLER func when exception thrown in
     __call/... arg passing). (Nikita)
   . Fixed bug #69221 (Segmentation fault when using a generator in combination
diff --git a/ext/standard/tests/serialize/serialization_objects_016.phpt b/ext/standard/tests/serialize/bug69210.phpt
similarity index 100%
rename from ext/standard/tests/serialize/serialization_objects_016.phpt
rename to ext/standard/tests/serialize/bug69210.phpt
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 557d71cb37..3f2c0d7887 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -658,7 +658,7 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_pt
 
 			if (Z_TYPE_PP(name) != IS_STRING) {
 				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize.");
-				convert_to_string(name);
+				convert_to_string(*name);
 			}
 			propers = Z_OBJPROP_P(struc);
 			if (zend_hash_find(propers, Z_STRVAL_PP(name), Z_STRLEN_PP(name) + 1, (void *) &d) == SUCCESS) {