Fix more dl() interned string assertions

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 452a8c78d79881fc82bd8a14bb2392f2cf0438ec..43c12f4f2cd1273d45944144fc645e99860577cf 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2279,14 +2279,14 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
                                return FAILURE;
                        }
                }
-               lowercase_name = zend_string_tolower_ex(internal_function->function_name, 1);
+               lowercase_name = zend_string_tolower_ex(internal_function->function_name, type == MODULE_PERSISTENT);
                lowercase_name = zend_new_interned_string(lowercase_name);
                reg_function = malloc(sizeof(zend_internal_function));
                memcpy(reg_function, &function, sizeof(zend_internal_function));
                if (zend_hash_add_ptr(target_function_table, lowercase_name, reg_function) == NULL) {
                        unload=1;
                        free(reg_function);
-                       zend_string_release_ex(lowercase_name, 1);
+                       zend_string_release(lowercase_name);
                        break;
                }
 
@@ -2378,7 +2378,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
                }
                ptr++;
                count++;
-               zend_string_release_ex(lowercase_name, 1);
+               zend_string_release(lowercase_name);
        }
        if (unload) { /* before unloading, display all remaining bad function in the module */
                if (scope) {
@@ -2724,10 +2724,10 @@ static zend_class_entry *do_register_internal_class(zend_class_entry *orig_class
        class_entry->info.internal.module = EG(current_module);
 
        if (class_entry->info.internal.builtin_functions) {
-               zend_register_functions(class_entry, class_entry->info.internal.builtin_functions, &class_entry->function_table, MODULE_PERSISTENT);
+               zend_register_functions(class_entry, class_entry->info.internal.builtin_functions, &class_entry->function_table, EG(current_module)->type);
        }
 
-       lowercase_name = zend_string_tolower_ex(orig_class_entry->name, 1);
+       lowercase_name = zend_string_tolower_ex(orig_class_entry->name, EG(current_module)->type == MODULE_PERSISTENT);
        lowercase_name = zend_new_interned_string(lowercase_name);
        zend_hash_update_ptr(CG(class_table), lowercase_name, class_entry);
        zend_string_release_ex(lowercase_name, 1);
@@ -2786,6 +2786,11 @@ ZEND_API int zend_register_class_alias_ex(const char *name, size_t name_len, zen
 {
        zend_string *lcname;
 
+       /* TODO: Move this out of here in 7.4. */
+       if (persistent && EG(current_module) && EG(current_module)->type == MODULE_TEMPORARY) {
+               persistent = 0;
+       }
+
        if (name[0] == '\\') {
                lcname = zend_string_alloc(name_len-1, persistent);
                zend_str_tolower_copy(ZSTR_VAL(lcname), name+1, name_len-1);
@@ -3696,6 +3701,11 @@ static inline zend_string *zval_make_interned_string(zval *zv) /* {{{ */
        return Z_STR_P(zv);
 }
 
+static zend_always_inline zend_bool is_persistent_class(zend_class_entry *ce) {
+       return (ce->type & ZEND_INTERNAL_CLASS)
+               && ce->info.internal.module->type == MODULE_PERSISTENT;
+}
+
 ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, zval *property, int access_type, zend_string *doc_comment) /* {{{ */
 {
        zend_property_info *property_info, *property_info_ptr;
@@ -3761,10 +3771,10 @@ ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, z
        if (access_type & ZEND_ACC_PUBLIC) {
                property_info->name = zend_string_copy(name);
        } else if (access_type & ZEND_ACC_PRIVATE) {
-               property_info->name = zend_mangle_property_name(ZSTR_VAL(ce->name), ZSTR_LEN(ce->name), ZSTR_VAL(name), ZSTR_LEN(name), ce->type & ZEND_INTERNAL_CLASS);
+               property_info->name = zend_mangle_property_name(ZSTR_VAL(ce->name), ZSTR_LEN(ce->name), ZSTR_VAL(name), ZSTR_LEN(name), is_persistent_class(ce));
        } else {
                ZEND_ASSERT(access_type & ZEND_ACC_PROTECTED);
-               property_info->name = zend_mangle_property_name("*", 1, ZSTR_VAL(name), ZSTR_LEN(name), ce->type & ZEND_INTERNAL_CLASS);
+               property_info->name = zend_mangle_property_name("*", 1, ZSTR_VAL(name), ZSTR_LEN(name), is_persistent_class(ce));
        }
 
        property_info->name = zend_new_interned_string(property_info->name);
@@ -3779,7 +3789,7 @@ ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, z
 
 ZEND_API int zend_declare_property(zend_class_entry *ce, const char *name, size_t name_length, zval *property, int access_type) /* {{{ */
 {
-       zend_string *key = zend_string_init(name, name_length, ce->type & ZEND_INTERNAL_CLASS);
+       zend_string *key = zend_string_init(name, name_length, is_persistent_class(ce));
        int ret = zend_declare_property_ex(ce, key, property, access_type, NULL);
        zend_string_release(key);
        return ret;