Merge remote-tracking branch 'origin/Ghidra_10.2'

This commit is contained in:
Ryan Kurtz 2022-10-21 13:43:22 -04:00
commit be36528218
21 changed files with 283 additions and 274 deletions

View file

@ -19,6 +19,8 @@ import java.io.IOException;
import java.util.*;
import java.util.function.Predicate;
import org.apache.commons.lang3.StringUtils;
import db.*;
import generic.FilteredIterator;
import ghidra.program.database.DBObjectCache;
@ -356,7 +358,7 @@ public class FunctionManagerDB implements FunctionManager {
throw new OverlappingFunctionException(entryPoint);
}
if (name == null || name.length() == 0 ||
if (StringUtils.isBlank(name) ||
SymbolUtilities.isReservedDynamicLabelName(name, program.getAddressFactory())) {
source = SourceType.DEFAULT;
name = "";