Fix potential nullptr dereference in UdtFieldDefinition::VisitBaseType

Fixes #12
wbenny · Jun 29, 2021 · 6b143a9 · 6b143a9
1 parent 43517b7
commit 6b143a9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Source/UdtFieldDefinition.h b/Source/UdtFieldDefinition.h
@@ -37,7 +37,13 @@ class UdtFieldDefinition
 				m_TypePrefix += "volatile ";
 			}
 
-			m_TypePrefix += PDB::GetBasicTypeString(Symbol, m_Settings->UseStdInt);
+			//
+			// If this returns null, it probably means BasicTypeMapMSVC and/or BasicTypeMapStdInt are out of date compared to MS DIA.
+			// Output the (non-compilable) type "<unknown_type>" instead of crashing.
+			//
+
+			const CHAR* BasicTypeString = PDB::GetBasicTypeString(Symbol, m_Settings->UseStdInt);
+			m_TypePrefix += (BasicTypeString != nullptr ? BasicTypeString : "<unknown_type>");
 		}
 
 		void