From d063734f6996913e8d9c24a7a9fa2cdd984b3df2 Mon Sep 17 00:00:00 2001 From: Drew Stratford Date: Tue, 22 Oct 2019 22:45:48 +1300 Subject: [PATCH] ProcFS: Check for empty Optional in read_bytes() In read_bytes() we now check that the Optional "data" actually contains a value before use, avoiding a failing asserting in kernel space. --- Kernel/FileSystem/ProcFS.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp index e523464914b..65beef277d7 100644 --- a/Kernel/FileSystem/ProcFS.cpp +++ b/Kernel/FileSystem/ProcFS.cpp @@ -997,10 +997,14 @@ ssize_t ProcFSInode::read_bytes(off_t offset, ssize_t count, u8* buffer, FileDes } auto& data = generated_data; - ssize_t nread = min(static_cast(data.value().size() - offset), static_cast(count)); - memcpy(buffer, data.value().data() + offset, nread); - if (nread == 0 && description && description->generator_cache()) - description->generator_cache().clear(); + ssize_t nread = 0; + if (data.has_value()) { + nread = min(static_cast(data.value().size() - offset), static_cast(count)); + memcpy(buffer, data.value().data() + offset, nread); + if (nread == 0 && description && description->generator_cache()) + description->generator_cache().clear(); + } + return nread; }