From a59df32703ea8b5f2439377303bdb71d5c7d3db0 Mon Sep 17 00:00:00 2001 From: AndreasP Date: Mon, 5 Sep 2022 08:51:25 +0200 Subject: [PATCH] Add some safety checks --- .../GraphicalDebugging/ExpressionLoader_UserDefined.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Visual_Studio_2017/GraphicalDebugging/ExpressionLoader_UserDefined.cs b/Visual_Studio_2017/GraphicalDebugging/ExpressionLoader_UserDefined.cs index 635e56f..d7a1270 100644 --- a/Visual_Studio_2017/GraphicalDebugging/ExpressionLoader_UserDefined.cs +++ b/Visual_Studio_2017/GraphicalDebugging/ExpressionLoader_UserDefined.cs @@ -685,7 +685,7 @@ public Loader Create(Loaders loaders, Debugger debugger, string name, string typ exprs, new Geometry.Traits(2, cs, unit)); - return simpleGeometry != null + return simpleGeometry != null && simpleGeometry.IsValid == true ? new UserPoint(simpleGeometry) : null; } @@ -710,7 +710,7 @@ public override Geometry.Traits GetTraits(MemoryReader mreader, Debugger debugge public override ExpressionDrawer.Point LoadPointParsed(Debugger debugger, string name, string type) { UserSimpleGeometryMembers members = simpleGeometry.LoadParsed(debugger, name); - return members != null + return members != null && members.Values != null && members.Values.Length >= 2 ? new ExpressionDrawer.Point(members.Values[0], members.Values[1]) : null; } @@ -719,7 +719,7 @@ public override ExpressionDrawer.Point LoadPointMemory(MemoryReader mreader, Deb string name, string type) { UserSimpleGeometryMembers members = simpleGeometry.LoadMemory(mreader, debugger, name); - return members != null + return members != null && members.Values != null && members.Values.Length >= 2 ? new ExpressionDrawer.Point(members.Values[0], members.Values[1]) : null; }