Skip to content

Commit 67b36d9

Browse files
committed
Unserialize: Migrate "Unexpected end of serialized data" to E_WARNING
1 parent 4a8e35c commit 67b36d9

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

ext/standard/tests/serialize/__serialize_006.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var_dump(unserialize('O:4:"Test":1:{}'));
1111

1212
?>
1313
--EXPECTF--
14-
Notice: unserialize(): Unexpected end of serialized data in %s on line %d
14+
Warning: unserialize(): Unexpected end of serialized data in %s on line %d
1515

1616
Notice: unserialize(): Error at offset 14 of 15 bytes in %s on line %d
1717
bool(false)

ext/standard/tests/serialize/bug72663_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var_dump(unserialize($exploit));
2121
--EXPECTF--
2222
Deprecated: %s implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
2323

24-
Notice: unserialize(): Unexpected end of serialized data in %s on line %d
24+
Warning: unserialize(): Unexpected end of serialized data in %s on line %d
2525

2626
Notice: unserialize(): Error at offset 49 of 50 bytes in %s on line %d
2727

ext/standard/tests/serialize/bug72663_3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ session_decode($sess);
1212
var_dump($_SESSION);
1313
?>
1414
--EXPECTF--
15-
Notice: session_decode(): Unexpected end of serialized data in %s on line %d
15+
Warning: session_decode(): Unexpected end of serialized data in %s on line %d
1616

1717
Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d
1818
array(0) {

ext/standard/tests/serialize/bug73341.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ unserialize($exploit);
2020
--EXPECTF--
2121
Error at offset 6 of 7 bytes
2222

23-
Notice: ArrayObject::unserialize(): Unexpected end of serialized data in %sbug73341.php on line %d
23+
Warning: ArrayObject::unserialize(): Unexpected end of serialized data in %sbug73341.php on line %d
2424
Error at offset 24 of 34 bytes

ext/standard/tests/serialize/unserialize_leak.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ try {
1212

1313
?>
1414
--EXPECTF--
15-
Notice: SplObjectStorage::unserialize(): Unexpected end of serialized data in %s on line %d
15+
Warning: SplObjectStorage::unserialize(): Unexpected end of serialized data in %s on line %d
1616
Error at offset 24 of 113 bytes

ext/standard/tests/strings/bug72663.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DONE
2121
--EXPECTF--
2222
Deprecated: %s implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
2323

24-
Notice: unserialize(): Unexpected end of serialized data in %sbug72663.php on line %d
24+
Warning: unserialize(): Unexpected end of serialized data in %s on line %d
2525

2626
Notice: unserialize(): Error at offset 49 of 50 bytes in %sbug72663.php on line %d
2727

ext/standard/tests/strings/bug72663_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var_dump($_SESSION);
1313
?>
1414
DONE
1515
--EXPECTF--
16-
Notice: session_decode(): Unexpected end of serialized data in %sbug72663_2.php on line %d
16+
Warning: session_decode(): Unexpected end of serialized data in %s on line %d
1717

1818
Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d
1919
array(0) {

ext/standard/var_unserializer.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@ fail:
14021402
14031403
"}" {
14041404
/* this is the case where we have less data than planned */
1405-
php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
1405+
php_error_docref(NULL, E_WARNING, "Unexpected end of serialized data");
14061406
return 0; /* not sure if it should be 0 or 1 here? */
14071407
}
14081408

0 commit comments

Comments
 (0)