Skip to content

Fixed serialization of non string values on __sleep #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 23, 2015
Merged

Fixed serialization of non string values on __sleep #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbdeccd
Fixed serialization of non string values on __sleep
jrbasso Feb 6, 2015
6b7b5e7
Renamed test case to match with reported bug
jrbasso Mar 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions ext/standard/tests/serialize/bug69210.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
--TEST--
serialize() integrity with non string on __sleep
--FILE--
<?php
class testString
{
public $a = true;

public function __sleep()
{
return array('a', '1');
}
}

class testInteger
{
public $a = true;

public function __sleep()
{
return array('a', 1);
}
}

$cs = new testString();
$ci = new testInteger();

$ss = @serialize($cs);
echo $ss . "\n";

$si = @serialize($ci);
echo $si . "\n";

var_dump(unserialize($ss));
var_dump(unserialize($si));
?>
--EXPECT--
O:10:"testString":2:{s:1:"a";b:1;s:1:"1";N;}
O:11:"testInteger":2:{s:1:"a";b:1;s:1:"1";N;}
object(testString)#3 (2) {
["a"]=>
bool(true)
["1"]=>
NULL
}
object(testInteger)#3 (2) {
["a"]=>
bool(true)
["1"]=>
NULL
}
5 changes: 1 addition & 4 deletions ext/standard/var.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,10 +705,7 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_pt

if (Z_TYPE_P(name) != IS_STRING) {
php_error_docref(NULL, E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize.");
/* we should still add element even if it's not OK,
* since we already wrote the length of the array before */
smart_str_appendl(buf,"N;", 2);
continue;
convert_to_string(name);
}
propers = Z_OBJPROP_P(struc);
if ((d = zend_hash_find(propers, Z_STR_P(name))) != NULL) {
Expand Down