Fix loading of user-defined point-based boxes, segments and rays

awulkiew · Aug 17, 2024 · 2083961 · 2083961
1 parent 0b9e846
commit 2083961
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/solution/GraphicalDebugging/ExpressionLoader_UserDefined.cs b/solution/GraphicalDebugging/ExpressionLoader_UserDefined.cs
@@ -304,14 +304,12 @@ public UserValueMember(Debugger debugger,
 
                 string name = expr.GetString(parentName);
                 type = debugger.GetValueType(name);
-                if (Debugger.IsInvalidType(type)
-                 || !debugger.GetTypeSizeof(type, out sizeOf)
-                 || !debugger.GetAddressOffset(parentName, name, out offset)
-                    // offset + size > sizeOf
-                 || Debugger.IsInvalidOffset(parentSizeOf, offset))
-                    return;
 
-                IsValid = true;
+                IsValid = !Debugger.IsInvalidType(type)
+                       && debugger.GetTypeSizeof(type, out sizeOf)
+                       && debugger.GetAddressOffset(parentName, name, out offset)
+                       // offset + size > sizeOf
+                       && !Debugger.IsInvalidOffset(parentSizeOf, offset);
             }
 
             public UserValue Load(MemoryReader mreader, Debugger debugger,
@@ -393,7 +391,7 @@ public UserPointMember(Loaders loaders, Debugger debugger,
 
                 // offset + size > sizeOf
                 IsValid = debugger.GetAddressOffset(parentName, name, out offset)
-                       && Debugger.IsInvalidOffset(parentSizeOf, offset);
+                       && !Debugger.IsInvalidOffset(parentSizeOf, offset);
             }
 
             public Geometry.Traits GetTraits(MemoryReader mreader, Debugger debugger, string parentName)

diff --git a/solution/GraphicalDebugging/release_notes.txt b/solution/GraphicalDebugging/release_notes.txt
@@ -4,6 +4,7 @@ additions:
 - add handling of C++ types decorated with module name
 bugfixes:
 - fixed cancelling of loading taking too much time
+- fixed loading of user-defined point-based boxes, segments and rays
 
 version 0.54