mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-08 10:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/IDB: Correctly check if transaction was aborted
Some checks are pending
CI / Lagom (arm64, Sanitizer_CI, false, macos-15, macOS, Clang) (push) Waiting to run
Details
CI / Lagom (x86_64, Fuzzers_CI, false, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Details
CI / Lagom (x86_64, Sanitizer_CI, false, ubuntu-24.04, Linux, GNU) (push) Waiting to run
Details
CI / Lagom (x86_64, Sanitizer_CI, true, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (macos-14, macOS, macOS-universal2) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (ubuntu-24.04, Linux, Linux-x86_64) (push) Waiting to run
Details
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Details
Lint Code / lint (push) Waiting to run
Details
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Details
Push notes / build (push) Waiting to run
Details

Browse source 
The associated databases upgrade transaction could be
null at the time we try to access it here.
This commit is contained in:
stelar7 2025-03-21 12:18:24 +01:00 • committed by Sam Atkins
parent e8b7447c36
commit 1844e10cd3
Notes: github-actions[bot] 2025-03-25 10:51:06 +00:00
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibWeb/IndexedDB/Internal/Algorithms.cpp
View file

@ -120,7 +120,8 @@ WebIDL::ExceptionOr<GC::Ref<IDBDatabase>> open_a_database_connection(JS::Realm&
})); }));
// 6. Run upgrade a database using connection, version and request. // 6. Run upgrade a database using connection, version and request.
upgrade_a_database(realm, connection, version, request); // AD-HOC: https://github.com/w3c/IndexedDB/issues/433#issuecomment-2512330086
auto upgrade_transaction = upgrade_a_database(realm, connection, version, request);
// 7. If connection was closed, return a newly created "AbortError" DOMException and abort these steps. // 7. If connection was closed, return a newly created "AbortError" DOMException and abort these steps.
if (connection->state() == IDBDatabase::ConnectionState::Closed) { if (connection->state() == IDBDatabase::ConnectionState::Closed) {
@ -129,8 +130,7 @@ WebIDL::ExceptionOr<GC::Ref<IDBDatabase>> open_a_database_connection(JS::Realm&
// 8. If the upgrade transaction was aborted, run the steps to close a database connection with connection, // 8. If the upgrade transaction was aborted, run the steps to close a database connection with connection,
// return a newly created "AbortError" DOMException and abort these steps. // return a newly created "AbortError" DOMException and abort these steps.
auto transaction = connection->associated_database()->upgrade_transaction(); if (upgrade_transaction->aborted()) {
if (transaction->aborted()) {
close_a_database_connection(*connection, true); close_a_database_connection(*connection, true);
return WebIDL::AbortError::create(realm, "Upgrade transaction was aborted"_string); return WebIDL::AbortError::create(realm, "Upgrade transaction was aborted"_string);
} }
@ -304,7 +304,7 @@ void close_a_database_connection(IDBDatabase& connection, bool forced)
} }
// https://w3c.github.io/IndexedDB/#upgrade-a-database // https://w3c.github.io/IndexedDB/#upgrade-a-database
void upgrade_a_database(JS::Realm& realm, GC::Ref<IDBDatabase> connection, u64 version, GC::Ref<IDBRequest> request) GC::Ref<IDBTransaction> upgrade_a_database(JS::Realm& realm, GC::Ref<IDBDatabase> connection, u64 version, GC::Ref<IDBRequest> request)
{ {
// 1. Let db be connection’s database. // 1. Let db be connection’s database.
auto db = connection->associated_database(); auto db = connection->associated_database();
@ -365,6 +365,8 @@ void upgrade_a_database(JS::Realm& realm, GC::Ref<IDBDatabase> connection, u64 v
HTML::main_thread_event_loop().spin_until(GC::create_function(realm.vm().heap(), [&wait_for_transaction]() { HTML::main_thread_event_loop().spin_until(GC::create_function(realm.vm().heap(), [&wait_for_transaction]() {
return !wait_for_transaction; return !wait_for_transaction;
})); }));
return transaction;
} }
// https://w3c.github.io/IndexedDB/#deleting-a-database // https://w3c.github.io/IndexedDB/#deleting-a-database

2
Libraries/LibWeb/IndexedDB/Internal/Algorithms.h
View file

@ -17,7 +17,7 @@ WebIDL::ExceptionOr<GC::Ref<IDBDatabase>> open_a_database_connection(JS::Realm&,
bool fire_a_version_change_event(JS::Realm&, FlyString const&, GC::Ref<DOM::EventTarget>, u64, Optional<u64>); bool fire_a_version_change_event(JS::Realm&, FlyString const&, GC::Ref<DOM::EventTarget>, u64, Optional<u64>);
ErrorOr<GC::Ref<Key>> convert_a_value_to_a_key(JS::Realm&, JS::Value, Vector<JS::Value> = {}); ErrorOr<GC::Ref<Key>> convert_a_value_to_a_key(JS::Realm&, JS::Value, Vector<JS::Value> = {});
void close_a_database_connection(IDBDatabase&, bool forced = false); void close_a_database_connection(IDBDatabase&, bool forced = false);
void upgrade_a_database(JS::Realm&, GC::Ref<IDBDatabase>, u64, GC::Ref<IDBRequest>); GC::Ref<IDBTransaction> upgrade_a_database(JS::Realm&, GC::Ref<IDBDatabase>, u64, GC::Ref<IDBRequest>);
WebIDL::ExceptionOr<u64> delete_a_database(JS::Realm&, StorageAPI::StorageKey, String, GC::Ref<IDBRequest>); WebIDL::ExceptionOr<u64> delete_a_database(JS::Realm&, StorageAPI::StorageKey, String, GC::Ref<IDBRequest>);
void abort_a_transaction(IDBTransaction&, GC::Ptr<WebIDL::DOMException>); void abort_a_transaction(IDBTransaction&, GC::Ptr<WebIDL::DOMException>);
JS::Value convert_a_key_to_a_value(JS::Realm&, GC::Ref<Key>); JS::Value convert_a_key_to_a_value(JS::Realm&, GC::Ref<Key>);