mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-20 09:49:15 +03:00
Kernel: Replace String with NonnullOwnPtr<KString> in sys$getkeymap
This commit is contained in:
parent
e4878175df
commit
8dfd124718
Notes:
sideshowbarker
2024-07-17 20:16:30 +09:00
Author: https://github.com/IdanHo Commit: https://github.com/SerenityOS/serenity/commit/8dfd1247187 Pull-request: https://github.com/SerenityOS/serenity/pull/12113 Reviewed-by: https://github.com/bgianfo ✅
@ -43,7 +43,7 @@ ErrorOr<FlatPtr> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_pa
|
||||
TRY(require_promise(Pledge::getkeymap));
|
||||
auto params = TRY(copy_typed_from_user(user_params));
|
||||
|
||||
String keymap_name = HIDManagement::the().keymap_name();
|
||||
auto keymap_name = TRY(KString::try_create(HIDManagement::the().keymap_name()));
|
||||
Keyboard::CharacterMapData const& character_maps = HIDManagement::the().character_map();
|
||||
|
||||
TRY(copy_to_user(params.map, character_maps.map, CHAR_MAP_SIZE * sizeof(u32)));
|
||||
@ -52,9 +52,9 @@ ErrorOr<FlatPtr> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_pa
|
||||
TRY(copy_to_user(params.altgr_map, character_maps.altgr_map, CHAR_MAP_SIZE * sizeof(u32)));
|
||||
TRY(copy_to_user(params.shift_altgr_map, character_maps.shift_altgr_map, CHAR_MAP_SIZE * sizeof(u32)));
|
||||
|
||||
if (params.map_name.size < keymap_name.length())
|
||||
if (params.map_name.size < keymap_name->length())
|
||||
return ENAMETOOLONG;
|
||||
TRY(copy_to_user(params.map_name.data, keymap_name.characters(), keymap_name.length()));
|
||||
TRY(copy_to_user(params.map_name.data, keymap_name->characters(), keymap_name->length()));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user