Merge pull request #4027 from pleroy/4026b

Detect the case of a null guid or name in InsertOrKeepVessel
mockingbirdnest · Jun 19, 2024 · 334a659 · 334a659
2 parents 59e4f4b + 1db8f95
commit 334a659
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/ksp_plugin/interface.cpp b/ksp_plugin/interface.cpp
@@ -887,6 +887,12 @@ void __cdecl principia__InsertOrKeepVessel(Plugin* const plugin,
   journal::Method<journal::InsertOrKeepVessel> m(
       {plugin, vessel_guid, vessel_name, parent_index, loaded}, {inserted});
   CHECK_NOTNULL(plugin);
+  CHECK(vessel_guid != nullptr)
+      << "name: "
+      << (vessel_name == nullptr ? "null" : std::string_view(vessel_name));
+  CHECK(vessel_name != nullptr)
+      << "guid: "
+      << (vessel_guid == nullptr ? "null" : std::string_view(vessel_guid));
   plugin->InsertOrKeepVessel(vessel_guid,
                              vessel_name,
                              parent_index,