Merge remote-tracking branch 'origin/patch'

This commit is contained in:
ghidra1 2021-01-11 18:50:07 -05:00
commit cc483f08ab
11 changed files with 502 additions and 133 deletions

View file

@ -1473,11 +1473,12 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
public DataType getDataType(String dataTypePath) {
// Category path now has sourceID followed by ":" followed by path under that source.
String name = getName();
if (dataTypePath.startsWith(name)) {
dataTypePath = dataTypePath.substring(name.length());
int nameLen = name.length();
if (dataTypePath.length() > nameLen && dataTypePath.charAt(nameLen) == '/' &&
dataTypePath.startsWith(name)) {
dataTypePath = dataTypePath.substring(nameLen);
}
if (!dataTypePath.startsWith("/")) {
else if (!dataTypePath.startsWith("/")) {
return null;
}