From f24a6a75748511662b940161a5989fae91c86d38 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 7 Feb 2020 00:01:28 +0100 Subject: [PATCH] WindowServer: Fix wrong-sized read() from keyboard It's unfortunate that WindowServer::KeyEvent and the kernel KeyEvent have the same name here. Fixes #1190. --- Servers/WindowServer/EventLoop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Servers/WindowServer/EventLoop.cpp b/Servers/WindowServer/EventLoop.cpp index 50e43fa52b..538cb9c722 100644 --- a/Servers/WindowServer/EventLoop.cpp +++ b/Servers/WindowServer/EventLoop.cpp @@ -140,7 +140,7 @@ void EventLoop::drain_keyboard() auto& screen = Screen::the(); for (;;) { ::KeyEvent event; - ssize_t nread = read(m_keyboard_fd, (u8*)&event, sizeof(KeyEvent)); + ssize_t nread = read(m_keyboard_fd, (u8*)&event, sizeof(::KeyEvent)); if (nread == 0) break; ASSERT(nread == sizeof(::KeyEvent));