diff options
| author | Stanislav Malyshev <stas@php.net> | 2017-01-02 21:59:59 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2017-01-02 21:59:59 -0800 |
| commit | 0f0406a1c98337d02b1f69ec23567cb99bdcf8e0 (patch) | |
| tree | 0926cafa3ca44ba32be701a3f8f24e57f622a4c6 /ext | |
| parent | ca72faa2c50b249715597bbee51fcd01718a0494 (diff) | |
| parent | ea6e54aff376926fb9ef83411f732b9477cf9b11 (diff) | |
| download | php-git-0f0406a1c98337d02b1f69ec23567cb99bdcf8e0.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix error reporting
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/var_unserializer.c | 4 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 36c3de7b2c..25e44e2aa6 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -492,7 +492,7 @@ static inline zend_long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry * } else { /* If this class implements Serializable, it should not land here but in object_custom(). The passed string obviously doesn't descend from the regular serializer. */ - zend_error(E_WARNING, "Erroneous data format for unserializing '%s'", ce->name); + zend_error(E_WARNING, "Erroneous data format for unserializing '%s'", ZSTR_VAL(ce->name)); return -1; } @@ -553,7 +553,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) var_entries *orig_var_entries = (*var_hash)->last; zend_long orig_used_slots = orig_var_entries ? orig_var_entries->used_slots : 0; int result; - + result = php_var_unserialize_internal(UNSERIALIZE_PASSTHRU); if (!result) { diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 0e55be9cba..c943e10050 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -496,7 +496,7 @@ static inline zend_long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry * } else { /* If this class implements Serializable, it should not land here but in object_custom(). The passed string obviously doesn't descend from the regular serializer. */ - zend_error(E_WARNING, "Erroneous data format for unserializing '%s'", ce->name); + zend_error(E_WARNING, "Erroneous data format for unserializing '%s'", ZSTR_VAL(ce->name)); return -1; } @@ -557,7 +557,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) var_entries *orig_var_entries = (*var_hash)->last; zend_long orig_used_slots = orig_var_entries ? orig_var_entries->used_slots : 0; int result; - + result = php_var_unserialize_internal(UNSERIALIZE_PASSTHRU); if (!result) { |