fix

Author: zeriyoshi

Zend/Optimizer/zend_func_infos.h

@@ -289,9 +289,7 @@ static const func_info_t func_infos[] = {
 	F1("opcache_get_status", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
 	F1("opcache_get_configuration", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
 	FN("OPcache\\volatile_fetch_array", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_NULL|MAY_BE_ARRAY_OF_FALSE|MAY_BE_ARRAY_OF_TRUE|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_DOUBLE|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_NULL),
-	FN("OPcache\\volatile_cache_info", MAY_BE_OBJECT),
 	FN("OPcache\\persistent_fetch_array", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_NULL|MAY_BE_ARRAY_OF_FALSE|MAY_BE_ARRAY_OF_TRUE|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_DOUBLE|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_NULL),
-	FN("OPcache\\persistent_cache_info", MAY_BE_OBJECT),
 	F1("openssl_x509_parse", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
 	F1("openssl_csr_get_subject", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
 	F1("openssl_pkey_get_details", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),

ext/opcache/zend_static_cache_statics.c

@@ -2970,6 +2970,78 @@ static void zend_opcache_static_cache_publish_context(zend_opcache_static_cache_
 	zend_opcache_static_cache_restore_context(previous_context);
 }
 
+static void zend_opcache_static_cache_capture_decoded_reachable_value_ex(
+	zval *value,
+	HashTable *seen_arrays,
+	HashTable *seen_objects
+);
+
+static void zend_opcache_static_cache_capture_decoded_hash_values(
+	HashTable *values,
+	HashTable *seen_arrays,
+	HashTable *seen_objects
+)
+{
+	zval *child, *source_value;
+
+	if (values == NULL) {
+		return;
+	}
+
+	ZEND_HASH_FOREACH_VAL(values, child) {
+		source_value = Z_TYPE_P(child) == IS_INDIRECT ? Z_INDIRECT_P(child) : child;
+		if (Z_TYPE_P(source_value) != IS_UNDEF) {
+			zend_opcache_static_cache_capture_decoded_reachable_value_ex(source_value, seen_arrays, seen_objects);
+		}
+	} ZEND_HASH_FOREACH_END();
+}
+
+static bool zend_opcache_static_cache_capture_decoded_safe_direct_object(
+	zval *value,
+	HashTable *seen_arrays,
+	HashTable *seen_objects
+)
+{
+	zend_class_entry *ce, *base_ce = NULL;
+	zend_opcache_static_cache_safe_direct_state_serialize_func_t serialize_func;
+	zval state;
+	HashTable *properties;
+
+	ce = Z_OBJCE_P(value);
+	base_ce = zend_opcache_serializer_find_safe_direct_cache_base(ce);
+	if (base_ce == NULL ||
+		zend_opcache_serializer_has_safe_direct_cache_overrides(ce, base_ce)
+	) {
+		return false;
+	}
+
+	serialize_func = zend_opcache_static_cache_safe_direct_state_serialize_func(ce);
+	if (serialize_func == NULL) {
+		return false;
+	}
+
+	/* Internal safe-direct objects may reject ZEND_PROP_PURPOSE_SERIALIZE
+	 * because their cache state is exposed through explicit handlers. */
+	ZVAL_UNDEF(&state);
+	if (serialize_func(value, &state) && Z_TYPE(state) == IS_ARRAY) {
+		zend_opcache_static_cache_capture_decoded_hash_values(Z_ARRVAL(state), seen_arrays, seen_objects);
+	}
+	if (!Z_ISUNDEF(state)) {
+		zval_ptr_dtor(&state);
+	}
+
+	if (EG(exception)) {
+		return true;
+	}
+
+	if (!zend_opcache_static_cache_safe_direct_state_includes_properties(ce)) {
+		properties = zend_std_get_properties(Z_OBJ_P(value));
+		zend_opcache_static_cache_capture_decoded_hash_values(properties, seen_arrays, seen_objects);
+	}
+
+	return true;
+}
+
 static void zend_opcache_static_cache_capture_decoded_reachable_value_ex(
 	zval *value,
 	HashTable *seen_arrays,
@@ -3026,6 +3098,10 @@ static void zend_opcache_static_cache_capture_decoded_reachable_value_ex(
 				return;
 			}
 
+			if (zend_opcache_static_cache_capture_decoded_safe_direct_object(value, seen_arrays, seen_objects)) {
+				return;
+			}
+
 			properties = zend_get_properties_for(value, ZEND_PROP_PURPOSE_SERIALIZE);
 			if (properties == NULL) {
 				return;