Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 22:05:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-4457: The dyld_shared_cache loader no longer throws an exception when

Browse Source 
importing newer versions that use dyld_cache_slide_info5
This commit is contained in:
Ryan Kurtz
2024-03-25 08:05:47 -04:00
parent 914d3ef326
commit 2aea201406
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheHeader.java
+3 -1
View File
@@ -408,7 +408,9 @@ public class DyldCacheHeader implements StructConverter {
DyldCacheSlideInfoCommon slideInfo = DyldCacheSlideInfoCommon.parseSlideInfo(reader, DyldCacheSlideInfoCommon slideInfo = DyldCacheSlideInfoCommon.parseSlideInfo(reader,
info.getSlideInfoFileOffset(), info.getAddress(), info.getSize(), info.getSlideInfoFileOffset(), info.getAddress(), info.getSize(),
info.getFileOffset(), log, monitor); info.getFileOffset(), log, monitor);
slideInfoList.add(slideInfo); if (slideInfo != null) {
slideInfoList.add(slideInfo);
}
} }
} }
} }
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfo4.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class DyldCacheSlideInfo4 extends DyldCacheSlideInfoCommon {
} }
/** /**
* Create a new {@link DyldCacheSlideInfo3}. * Create a new {@link DyldCacheSlideInfo4}.
* *
* @param reader A {@link BinaryReader} positioned at the start of a DYLD slide info 3 * @param reader A {@link BinaryReader} positioned at the start of a DYLD slide info 3
* @param mappingAddress The base address of where the slide fixups will take place * @param mappingAddress The base address of where the slide fixups will take place
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldCacheSlideInfoCommon.java
+4 -3
View File
@@ -67,9 +67,11 @@ public abstract class DyldCacheSlideInfoCommon implements StructConverter {
monitor.setMessage("Parsing DYLD slide info..."); monitor.setMessage("Parsing DYLD slide info...");
monitor.initialize(1); monitor.initialize(1);
String errorMessage = "Failed to parse dyld_cache_slide_info";
try { try {
reader.setPointerIndex(slideInfoOffset); reader.setPointerIndex(slideInfoOffset);
int version = reader.readInt(reader.getPointerIndex()); int version = reader.readInt(reader.getPointerIndex());
errorMessage += version;
DyldCacheSlideInfoCommon returnedSlideInfo = switch (version) { DyldCacheSlideInfoCommon returnedSlideInfo = switch (version) {
case 1 -> new DyldCacheSlideInfo1(reader, mappingAddress, mappingSize, case 1 -> new DyldCacheSlideInfo1(reader, mappingAddress, mappingSize,
mappingFileOffset); mappingFileOffset);
@@ -79,15 +81,14 @@ public abstract class DyldCacheSlideInfoCommon implements StructConverter {
mappingFileOffset); mappingFileOffset);
case 4 -> new DyldCacheSlideInfo4(reader, mappingAddress, mappingSize, case 4 -> new DyldCacheSlideInfo4(reader, mappingAddress, mappingSize,
mappingFileOffset); mappingFileOffset);
default -> throw new IOException("Unrecognized slide info version: " + version); default -> throw new IOException(); // will be caught and version will be added to message
}; };
monitor.incrementProgress(1); monitor.incrementProgress(1);
returnedSlideInfo.slideInfoOffset = slideInfoOffset; returnedSlideInfo.slideInfoOffset = slideInfoOffset;
return returnedSlideInfo; return returnedSlideInfo;
} }
catch (IOException e) { catch (IOException e) {
log.appendMsg(DyldCacheSlideInfoCommon.class.getSimpleName(), log.appendMsg(DyldCacheSlideInfoCommon.class.getSimpleName(), errorMessage);
"Failed to parse dyld_cache_slide_info.");
return null; return null;
} }
} }