mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 21:57:43 +00:00
LibSQL+SQLServer: Do not re-open databases
Both `Database` and `Heap` were allowed to be opened twice. Prevent this, and change SQLServer to only open databases that are not already opened. This fixes a Ladybird crash where opening the application twice would erroneously duplicate free heap block indices.
This commit is contained in:
parent
c05e08decb
commit
70ca295404
3 changed files with 8 additions and 4 deletions
|
@ -38,10 +38,11 @@ ErrorOr<NonnullRefPtr<DatabaseConnection>> DatabaseConnection::create(StringView
|
|||
return Error::from_string_view("Invalid database name"sv);
|
||||
|
||||
auto database = TRY(find_or_create_database(database_path, database_name));
|
||||
|
||||
if (auto result = database->open(); result.is_error()) {
|
||||
warnln("Could not open database: {}", result.error().error_string());
|
||||
return Error::from_string_view("Could not open database"sv);
|
||||
if (!database->is_open()) {
|
||||
if (auto result = database->open(); result.is_error()) {
|
||||
warnln("Could not open database: {}", result.error().error_string());
|
||||
return Error::from_string_view("Could not open database"sv);
|
||||
}
|
||||
}
|
||||
|
||||
return adopt_nonnull_ref_or_enomem(new (nothrow) DatabaseConnection(move(database), move(database_name), client_id));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue