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

Fixed bug #74111

Browse source
This commit is contained in:
Nikita Popov 2017-06-25 21:15:26 +02:00 • committed by Stanislav Malyshev
parent 0525574913
commit 3a25a56a92
3 changed files with 497 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/tests/serialize/bug25378.phpt
View file

@ -42,7 +42,7 @@ bool(false)
Notice: unserialize(): Error at offset 17 of 33 bytes in %sbug25378.php on line %d
bool(false)
Notice: unserialize(): Error at offset 33 of 32 bytes in %sbug25378.php on line %d
Notice: unserialize(): Error at offset 32 of 32 bytes in %sbug25378.php on line %d
bool(false)
Notice: unserialize(): Error at offset 2 of 13 bytes in %sbug25378.php on line %d

1001
ext/standard/var_unserializer.c
View file

File diff suppressed because it is too large Load diff

11
ext/standard/var_unserializer.re
View file

@ -432,15 +432,14 @@ string_key:
static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
{
if (*((*p)++) == '}')
return 1;
#if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE
zval_ptr_dtor(rval);
#endif
if (*p >= max || **p != '}') {
return 0;
}
(*p)++;
return 1;
}
static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
{
zend_long datalen;