Skip to content

Commit

Permalink
Merge remote-tracking branch
Browse files Browse the repository at this point in the history
'origin/GP-4763_ghidra007_rtti_added_skip_of_global_chds--SQUASHED' into
patch (Closes #6704)
  • Loading branch information
ryanmkurtz committed Jul 17, 2024
2 parents 30628db + c2bf8d0 commit bed16f9
Showing 1 changed file with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -868,7 +868,12 @@ private List<RecoveredClass> recoverClassesFromClassHierarchyDescriptors(

// 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);

Expand Down Expand Up @@ -2484,7 +2489,7 @@ private Map<RecoveredClass, Integer> getBaseClassOffsetMap(RecoveredClass recove
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;
Expand Down

0 comments on commit bed16f9

Please sign in to comment.