Merge remote-tracking branch 'origin/patch'

githuu5y5u · May 17, 2022 · a4111b1 · a4111b1
2 parents b177836 + 49a426e
commit a4111b1
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/DyldCacheUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/DyldCacheUtils.java
@@ -195,10 +195,7 @@ private List<File> getSplitDyldCacheFiles(ByteProvider baseProvider,
 			if (file != null && shouldCombineSplitFiles) {
 				String baseName = file.getName();
 				File[] splitFiles = file.getParentFile().listFiles(f -> {
-					if (!f.getName().startsWith(baseName)) {
-						return false;
-					}
-					if (f.getName().equals(baseName)) {
+					if (!f.getName().startsWith(baseName + ".")) {
 						return false;
 					}
 					if (f.getName().toLowerCase().endsWith(".map")) {