From 6c9a2f4c6157e83975ccb8bb8586b1220996b3b9 Mon Sep 17 00:00:00 2001
From: Lucian Popescu <lucian.popescu@tecnico.ulisboa.pt>
Date: Mon, 18 May 2026 10:00:06 +0100
Subject: [PATCH] Guard dereference of possibly std::nullopt

---
 cpp2rust/converter/mapper.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cpp2rust/converter/mapper.cpp b/cpp2rust/converter/mapper.cpp
index c2defbf8..e2b444f4 100644
--- a/cpp2rust/converter/mapper.cpp
+++ b/cpp2rust/converter/mapper.cpp
@@ -639,7 +639,9 @@ std::string MapInitializer(clang::QualType qual_type) {
   auto [rule, subs] = search(types_, type_str, GetTypeMapKey(type_str));
   if (rule && !rule->initializer.empty()) {
     for (auto &ty : subs) {
-      ty = mapTypeStringRecursive(*ty);
+      if (ty) {
+        ty = mapTypeStringRecursive(*ty);
+      }
     }
     return instantiateTgt(subs, rule->initializer);
   }