Skip to content

Commit 2083961

Browse files
committed
Fix loading of user-defined point-based boxes, segments and rays
1 parent 0b9e846 commit 2083961

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

solution/GraphicalDebugging/ExpressionLoader_UserDefined.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,14 +304,12 @@ public UserValueMember(Debugger debugger,
304304

305305
string name = expr.GetString(parentName);
306306
type = debugger.GetValueType(name);
307-
if (Debugger.IsInvalidType(type)
308-
|| !debugger.GetTypeSizeof(type, out sizeOf)
309-
|| !debugger.GetAddressOffset(parentName, name, out offset)
310-
// offset + size > sizeOf
311-
|| Debugger.IsInvalidOffset(parentSizeOf, offset))
312-
return;
313307

314-
IsValid = true;
308+
IsValid = !Debugger.IsInvalidType(type)
309+
&& debugger.GetTypeSizeof(type, out sizeOf)
310+
&& debugger.GetAddressOffset(parentName, name, out offset)
311+
// offset + size > sizeOf
312+
&& !Debugger.IsInvalidOffset(parentSizeOf, offset);
315313
}
316314

317315
public UserValue Load(MemoryReader mreader, Debugger debugger,
@@ -393,7 +391,7 @@ public UserPointMember(Loaders loaders, Debugger debugger,
393391

394392
// offset + size > sizeOf
395393
IsValid = debugger.GetAddressOffset(parentName, name, out offset)
396-
&& Debugger.IsInvalidOffset(parentSizeOf, offset);
394+
&& !Debugger.IsInvalidOffset(parentSizeOf, offset);
397395
}
398396

399397
public Geometry.Traits GetTraits(MemoryReader mreader, Debugger debugger, string parentName)

solution/GraphicalDebugging/release_notes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ additions:
44
- add handling of C++ types decorated with module name
55
bugfixes:
66
- fixed cancelling of loading taking too much time
7+
- fixed loading of user-defined point-based boxes, segments and rays
78

89
version 0.54
910

0 commit comments

Comments
 (0)