瀏覽代碼

LibWeb: Always assert that principal realm returns a principal realm

There was a bug in the HTML proposal where a synthetic realm settings
object's principal realm was a shadow realm if there were nested shadow
realms, which this assertion catches more directly (rather than later
down the track, where it is used).

We were meant to also assert for this case, but we were previously
returning early.
Shannon Booth 8 月之前
父節點
當前提交
bb10b0e301
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 5 5
      Libraries/LibWeb/HTML/Scripting/Environments.cpp
  2. 1 1
      Libraries/LibWeb/HTML/Scripting/Environments.h

+ 5 - 5
Libraries/LibWeb/HTML/Scripting/Environments.cpp

@@ -360,19 +360,19 @@ JS::Realm& current_principal_realm()
 }
 
 // https://whatpr.org/html/9893/webappapis.html#concept-principal-realm-of-realm
-JS::Realm& principal_realm(JS::Realm& realm)
+JS::Realm& principal_realm(GC::Ref<JS::Realm> realm)
 {
-    VERIFY(realm.host_defined());
+    VERIFY(realm->host_defined());
 
     // 1. If realm.[[HostDefined]] is a synthetic realm settings object, then:
-    if (is<Bindings::SyntheticHostDefined>(*realm.host_defined())) {
+    if (is<Bindings::SyntheticHostDefined>(*realm->host_defined())) {
         // 1. Assert: realm is a synthetic realm.
         // 2. Set realm to the principal realm of realm.[[HostDefined]].
-        return static_cast<Bindings::SyntheticHostDefined const&>(*realm.host_defined()).synthetic_realm_settings.principal_realm;
+        realm = static_cast<Bindings::SyntheticHostDefined const&>(*realm->host_defined()).synthetic_realm_settings.principal_realm;
     }
 
     // 2. Assert: realm.[[HostDefined]] is an environment settings object and realm is a principal realm.
-    VERIFY(is<Bindings::PrincipalHostDefined>(*realm.host_defined()));
+    VERIFY(is<Bindings::PrincipalHostDefined>(*realm->host_defined()));
 
     // 3. Return realm.
     return realm;

+ 1 - 1
Libraries/LibWeb/HTML/Scripting/Environments.h

@@ -149,7 +149,7 @@ JS::Realm& current_principal_realm();
 EnvironmentSettingsObject& principal_realm_settings_object(JS::Realm&);
 EnvironmentSettingsObject& current_principal_settings_object();
 
-JS::Realm& principal_realm(JS::Realm&);
+JS::Realm& principal_realm(GC::Ref<JS::Realm>);
 JS::Object& current_principal_global_object();
 JS::Realm& relevant_realm(JS::Object const&);
 EnvironmentSettingsObject& relevant_settings_object(JS::Object const&);