RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:28:12 +00:00
Code Issues Activity Actions

LibWeb: Queue a task to proceed after module map entry finishes fetching

Browse source 
We were doing this synchronously, which was unsafe in that caused us to
re-enter the module map entry setting code while iterating over the
map's entries.

The fix is simply to do what the spec says and queue up a task. This way
the processing gets deferred to a later time.

To avoid stepping into this problem again, I've also added a reentrancy
check in ModuleMap.

This fixes a sporadic crash in HTML::ModuleMap::add() caught by ASAN.
In particular, this was happening regularly on https://shopify.com/
This commit is contained in:
Andreas Kling 2023-12-16 18:32:01 +01:00
parent 2753075830
commit e28ac74e0b
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/HTML/Scripting/Fetching.cpp
View file

@ -579,14 +579,14 @@ void fetch_single_module_script(JS::Realm& realm,
// 5. If moduleMap[(url, moduleType)] is "fetching", wait in parallel until that entry's value changes,
// then queue a task on the networking task source to proceed with running the following steps.
if (module_map.is_fetching(url, module_type)) {
module_map.wait_for_change(realm.heap(), url, module_type, [on_complete](auto entry) -> void {
// FIXME: This should queue a task.
module_map.wait_for_change(realm.heap(), url, module_type, [on_complete, &realm](auto entry) -> void {
HTML::queue_global_task(HTML::Task::Source::Networking, realm.global_object(), [on_complete, entry] {
// FIXME: This should run other steps, for now we just assume the script loaded.
VERIFY(entry.type == ModuleMap::EntryType::ModuleScript);
on_complete->function()(entry.module_script);
});
});
return;
}

8
Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.cpp
View file

@ -47,12 +47,18 @@ Optional<ModuleMap::Entry> ModuleMap::get(AK::URL const& url, DeprecatedString c
AK::HashSetResult ModuleMap::set(AK::URL const& url, DeprecatedString const& type, Entry entry)
{
// NOTE: Re-entering this function while firing wait_for_change callbacks is not allowed.
VERIFY(!m_firing_callbacks);
auto value = m_values.set({ url, type }, entry);
auto callbacks = m_callbacks.get({ url, type });
if (callbacks.has_value())
if (callbacks.has_value()) {
m_firing_callbacks = true;
for (auto const& callback : *callbacks)
callback->function()(entry);
m_firing_callbacks = false;
}
return value;
}

2
Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h
View file

@ -72,6 +72,8 @@ private:
HashMap<ModuleLocationTuple, Entry> m_values;
HashMap<ModuleLocationTuple, Vector<CallbackFunction>> m_callbacks;
bool m_firing_callbacks { false };
};
}