diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:45:54 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:45:54 +0300 |
| commit | cf67a421e986b1020dd390a694185039b131ba7c (patch) | |
| tree | f19917f90e3e80510f0d70262dfe52ba2f7cb207 /ext | |
| parent | 8e01026b829f51d80d62648db9d81263454b2988 (diff) | |
| download | php-git-cf67a421e986b1020dd390a694185039b131ba7c.tar.gz | |
Use per-request heap instead of system one
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/var.c | 4 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.c | 6 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index e28afe9177..3f5d2ffe40 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -761,7 +761,7 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_pt } priv_name = zend_mangle_property_name( - ZSTR_VAL(ce->name), ZSTR_LEN(ce->name), ZSTR_VAL(name), ZSTR_LEN(name), ce->type & ZEND_INTERNAL_CLASS); + ZSTR_VAL(ce->name), ZSTR_LEN(ce->name), ZSTR_VAL(name), ZSTR_LEN(name), 0); val = zend_hash_find(propers, priv_name); if (val != NULL) { if (Z_TYPE_P(val) == IS_INDIRECT) { @@ -780,7 +780,7 @@ static void php_var_serialize_class(smart_str *buf, zval *struc, zval *retval_pt zend_string_free(priv_name); prot_name = zend_mangle_property_name( - "*", 1, ZSTR_VAL(name), ZSTR_LEN(name), ce->type & ZEND_INTERNAL_CLASS); + "*", 1, ZSTR_VAL(name), ZSTR_LEN(name), 0); val = zend_hash_find(propers, prot_name); if (val != NULL) { if (Z_TYPE_P(val) == IS_INDIRECT) { diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index d798b589fe..4a797e69c7 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -433,19 +433,19 @@ string_key: && (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) { if (existing_propinfo->flags & ZEND_ACC_PROTECTED) { new_key = zend_mangle_property_name( - "*", 1, ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), Z_OBJCE_P(rval)->type & ZEND_INTERNAL_CLASS); + "*", 1, ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), 0); zend_string_release(unmangled); } else if (existing_propinfo->flags & ZEND_ACC_PRIVATE) { if (unmangled_class != NULL && strcmp(unmangled_class, "*") != 0) { new_key = zend_mangle_property_name( unmangled_class, strlen(unmangled_class), ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), - Z_OBJCE_P(rval)->type & ZEND_INTERNAL_CLASS); + 0); } else { new_key = zend_mangle_property_name( ZSTR_VAL(existing_propinfo->ce->name), ZSTR_LEN(existing_propinfo->ce->name), ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), - Z_OBJCE_P(rval)->type & ZEND_INTERNAL_CLASS); + 0); } zend_string_release(unmangled); } else { diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 3cf82b1e7a..90f13ae01a 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -437,19 +437,19 @@ string_key: && (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) { if (existing_propinfo->flags & ZEND_ACC_PROTECTED) { new_key = zend_mangle_property_name( - "*", 1, ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), Z_OBJCE_P(rval)->type & ZEND_INTERNAL_CLASS); + "*", 1, ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), 0); zend_string_release(unmangled); } else if (existing_propinfo->flags & ZEND_ACC_PRIVATE) { if (unmangled_class != NULL && strcmp(unmangled_class, "*") != 0) { new_key = zend_mangle_property_name( unmangled_class, strlen(unmangled_class), ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), - Z_OBJCE_P(rval)->type & ZEND_INTERNAL_CLASS); + 0); } else { new_key = zend_mangle_property_name( ZSTR_VAL(existing_propinfo->ce->name), ZSTR_LEN(existing_propinfo->ce->name), ZSTR_VAL(unmangled), ZSTR_LEN(unmangled), - Z_OBJCE_P(rval)->type & ZEND_INTERNAL_CLASS); + 0); } zend_string_release(unmangled); } else { |