From 3e0266c9e9cf18e2bb98f80bf0491df6ffec720c Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 30 May 2021 19:59:03 +0200 Subject: [PATCH] Kernel: Unnamed regions still need a null-terminator in core dumps Fixes #7595. --- Kernel/CoreDump.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Kernel/CoreDump.cpp b/Kernel/CoreDump.cpp index 840134e95a..b73cb9e9f7 100644 --- a/Kernel/CoreDump.cpp +++ b/Kernel/CoreDump.cpp @@ -247,8 +247,12 @@ ByteBuffer CoreDump::create_notes_regions_data() const memory_region_info_buffer.append((void*)&info, sizeof(info)); // NOTE: The region name *is* null-terminated, so the following is ok: auto name = region->name(); - if (!name.is_null()) + if (name.is_empty()) { + char null_terminator = '\0'; + memory_region_info_buffer.append(&null_terminator, 1); + } else { memory_region_info_buffer.append(name.characters_without_null_termination(), name.length() + 1); + } regions_data += memory_region_info_buffer; }