From 97e60f2c7de6ee624b50b0eec821f974eaf660d6 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Sun, 7 May 2023 23:09:29 +0200 Subject: LibKeyboard: Read keymap through File, not DeprecatedFile This results in a new OOM prevention. Hooray! --- Userland/Libraries/LibKeyboard/CharacterMapFile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Userland/Libraries') diff --git a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp index 38e5904549..56efd8c207 100644 --- a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp +++ b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp @@ -7,7 +7,7 @@ #include "CharacterMapFile.h" #include #include -#include +#include namespace Keyboard { @@ -22,8 +22,8 @@ ErrorOr CharacterMapFile::load_from_file(DeprecatedString cons path = full_path.to_deprecated_string(); } - auto file = TRY(Core::DeprecatedFile::open(path, Core::OpenMode::ReadOnly)); - auto file_contents = file->read_all(); + auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read)); + auto file_contents = TRY(file->read_until_eof()); auto json_result = TRY(JsonValue::from_string(file_contents)); auto const& json = json_result.as_object(); -- cgit v1.2.3