Merge remote-tracking branch

'origin/GP-4763_ghidra007_rtti_added_skip_of_global_chds--SQUASHED' into
patch (Closes #6704)
This commit is contained in:
Ryan Kurtz 2024-07-17 13:22:02 -04:00
commit bed16f97c1

View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -868,7 +868,12 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
// Get class name from class vftable is in
Namespace classNamespace = classHierarchyDescriptorSymbol.getParentNamespace();
if (classNamespace.isGlobal()) {
Msg.warn(this, "ClassHierarchyDescriptor at " + classHierarchyDescriptorAddress +
" is unexpectedly in the Global namespace so processing cannot continue for " +
"this class");
continue;
}
// get the data type category associated with the given class namespace
Category category = getDataTypeCategory(classNamespace);
@ -2484,7 +2489,7 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
baseClassDescriptorAddress.toString());
continue;
}
// Continue if the class has mult inh but base class is not on the parent list
if (!recoveredClass.getParentList().contains(baseClass)) {
continue;