archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Request #67453 Allow to unserialize empty data.

Browse source 
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
This commit is contained in:
Remi Collet 2014-06-17 09:38:54 +02:00
parent b538816b0b
commit ea466a316f
5 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/spl/spl_array.c
View file

@ -1749,7 +1749,6 @@ SPL_METHOD(Array, unserialize)
} }
if (buf_len == 0) { if (buf_len == 0) {
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Empty serialized string cannot be empty");
return; return;
} }

1
ext/spl/spl_dllist.c
View file

@ -1192,7 +1192,6 @@ SPL_METHOD(SplDoublyLinkedList, unserialize)
} }
if (buf_len == 0) { if (buf_len == 0) {
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Serialized string cannot be empty");
return; return;
} }

1
ext/spl/spl_observer.c
View file

@ -831,7 +831,6 @@ SPL_METHOD(SplObjectStorage, unserialize)
} }
if (buf_len == 0) { if (buf_len == 0) {
zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Empty serialized string cannot be empty");
return; return;
} }

9
ext/spl/tests/ArrayObject_unserialize_empty_string.phpt
View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
ArrayObject: test that you cannot unserialize a empty string ArrayObject: test that you can unserialize a empty string
--CREDITS-- --CREDITS--
Havard Eide <nucleuz@gmail.com> Havard Eide <nucleuz@gmail.com>
#PHPTestFest2009 Norway 2009-06-09 \o/ #PHPTestFest2009 Norway 2009-06-09 \o/
@ -8,9 +8,6 @@ Havard Eide <nucleuz@gmail.com>
$a = new ArrayObject(array()); $a = new ArrayObject(array());
$a->unserialize(""); $a->unserialize("");
?> ?>
Done
--EXPECTF-- --EXPECTF--
Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Empty serialized string cannot be empty' in %s.php:%d Done
Stack trace:
#0 %s(%d): ArrayObject->unserialize('')
#1 {main}
thrown in %s.php on line %d

6
ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt
View file

@ -1,5 +1,5 @@
--TEST-- --TEST--
Check that SplObjectStorage::unserialize throws exception when NULL passed Check that SplObjectStorage::unserialize doesn't throws exception when NULL passed
--CREDITS-- --CREDITS--
PHPNW Testfest 2009 - Simon Westcott (swestcott@gmail.com) PHPNW Testfest 2009 - Simon Westcott (swestcott@gmail.com)
--FILE-- --FILE--
@ -14,6 +14,6 @@ try {
} }
?> ?>
Done
--EXPECTF-- --EXPECTF--
Empty serialized string cannot be empty Done