1 files changed, 11 insertions, 1 deletions
diff --git a/libs/multiboot2/include/multiboot2/information.hpp b/libs/multiboot2/include/multiboot2/information.hpp
index d2b4c98..462528d 100644
--- a/libs/multiboot2/include/multiboot2/information.hpp
+++ b/libs/multiboot2/include/multiboot2/information.hpp
@@ -176,7 +176,17 @@ namespace multiboot2
     template<elf::format Format>
     auto maybe_elf_symbols() const noexcept -> std::optional<elf_symbols<Format>>
     {
-      return get<multiboot2::elf_symbols<Format>>();
+      return get<multiboot2::elf_symbols<Format>>().and_then(
+          [](auto x) -> std::optional<multiboot2::elf_symbols<Format>> {
+            if (x.entry_size == elf::section_header_size<Format>)
+            {
+              return std::optional{x};
+            }
+            else
+            {
+              return std::nullopt;
+            }
+          });
     }
 
     template<elf::format Format>