php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use zend_string when storing incomplete class name

Browse Source 
No need to copy the string here...
This commit is contained in:
Nikita Popov
2020-08-28 10:01:46 +02:00
parent 1d0f55315e
commit c47011ba05
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/standard/incomplete_class.c
View File

@@ -142,12 +142,11 @@ PHPAPI zend_string *php_lookup_class_name(zend_object *object)
/* }}} */
/* {{{ php_store_class_name */
PHPAPI void php_store_class_name(zval *object, const char *name, size_t len)
PHPAPI void php_store_class_name(zval *object, zend_string *name)
{
zval val;
ZVAL_STRINGL(&val, name, len);
ZVAL_STR_COPY(&val, name);
zend_hash_str_update(Z_OBJPROP_P(object), MAGIC_MEMBER, sizeof(MAGIC_MEMBER)-1, &val);
}
/* }}} */

2
ext/standard/php_incomplete_class.h
View File

@@ -51,7 +51,7 @@ extern "C" {
PHPAPI void php_register_incomplete_class(void);
PHPAPI zend_string *php_lookup_class_name(zend_object *object);
PHPAPI void php_store_class_name(zval *object, const char *name, size_t len);
PHPAPI void php_store_class_name(zval *object, zend_string *name);
#ifdef __cplusplus
};

8
ext/standard/var_unserializer.re
View File

@@ -1013,7 +1013,7 @@ use_double:
}
object ":" uiv ":" ["] {
size_t len, len2, len3, maxlen;
size_t len, len3, maxlen;
zend_long elements;
char *str;
zend_string *class_name;
@@ -1031,7 +1031,7 @@ object ":" uiv ":" ["] {
custom_object = 1;
}
len2 = len = parse_uiv(start + 2);
len = parse_uiv(start + 2);
maxlen = max - YYCURSOR;
if (maxlen < len || len == 0) {
*p = start + 2;
@@ -1143,7 +1143,7 @@ object ":" uiv ":" ["] {
ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
if (ret && incomplete_class) {
php_store_class_name(rval, ZSTR_VAL(class_name), len2);
php_store_class_name(rval, class_name);
}
zend_string_release_ex(class_name, 0);
return ret;
@@ -1181,7 +1181,7 @@ object ":" uiv ":" ["] {
}
if (incomplete_class) {
php_store_class_name(rval, ZSTR_VAL(class_name), len2);
php_store_class_name(rval, class_name);
}
zend_string_release_ex(class_name, 0);