Guard dereference of possibly std::nullopt (#117)

lucic71 · web-flow · commit 64e7a61c661c · 2026-05-18T10:55:56.000+01:00
diff --git 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);
   }

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,9 @@ std::string MapInitializer(clang::QualType qual_type) {`
`639`	`639`	`auto [rule, subs] = search(types_, type_str, GetTypeMapKey(type_str));`
`640`	`640`	`if (rule && !rule->initializer.empty()) {`
`641`	`641`	`for (auto &ty : subs) {`
`642`		`- ty = mapTypeStringRecursive(*ty);`
	`642`	`+ if (ty) {`
	`643`	`+ ty = mapTypeStringRecursive(*ty);`
	`644`	`+ }`
`643`	`645`	`}`
`644`	`646`	`return instantiateTgt(subs, rule->initializer);`
`645`	`647`	`}`