development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-09-13 21:56:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2019-05-23 07:58:38 -04:00
parent 00f6515557 e2996ccd3c
commit fb2a4a0363
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/dyldcache/DyldCacheFileSystem.java
View file

@ -15,7 +15,8 @@
*/
package ghidra.file.formats.ios.dyldcache;
import java.io.*;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import ghidra.app.util.bin.BinaryReader;
@ -64,8 +65,7 @@ public class DyldCacheFileSystem extends GFileSystemBase {
*/
FixupMacho32bitArmOffsets fixer = new FixupMacho32bitArmOffsets();
File fixedFile = fixer.fix(file, machHeaderStartIndexInProvider, provider, monitor);
return new FileInputStream(fixedFile);
return fixer.fix(file, machHeaderStartIndexInProvider, provider, monitor);
}
catch (MachException e) {
throw new IOException("Invalid Mach-O header detected at 0x" +

20
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/dyldcache/FixupMacho32bitArmOffsets.java
View file

@ -15,6 +15,10 @@
*/
package ghidra.file.formats.ios.dyldcache;
import java.io.*;
import java.util.*;
import generic.continues.RethrowContinuesFactory;
import ghidra.app.util.bin.ByteProvider;
import ghidra.app.util.bin.format.macho.*;
import ghidra.app.util.bin.format.macho.commands.*;
@ -23,16 +27,11 @@ import ghidra.util.*;
import ghidra.util.exception.DuplicateNameException;
import ghidra.util.task.TaskMonitor;
import java.io.*;
import java.util.*;
import generic.continues.RethrowContinuesFactory;
public class FixupMacho32bitArmOffsets {
private DataConverter converter = new LittleEndianDataConverter();
public File fix(GFile file, long offsetAdjustment, ByteProvider provider, TaskMonitor monitor)
throws IOException, MachException {
public InputStream fix(GFile file, long offsetAdjustment, ByteProvider provider,
TaskMonitor monitor) throws IOException, MachException {
Map<Long, byte []> changeMap = new HashMap<Long, byte []>();
//check to make sure mach-o header is valid
@ -146,9 +145,8 @@ public class FixupMacho32bitArmOffsets {
List<Long> indexList = new ArrayList<Long>( changeMap.keySet() );
Collections.sort( indexList );
File tempMachoFile = File.createTempFile( "ghidra" + "_" + file.getName() + "_", ".macho.tmp" );
OutputStream tempOut = new FileOutputStream( tempMachoFile );
ByteArrayOutputStream tempOut = new ByteArrayOutputStream();
try {
long tempIndex = offsetAdjustment;
while ( !monitor.isCancelled() ) {
@ -174,6 +172,6 @@ public class FixupMacho32bitArmOffsets {
tempOut.close();
}
return tempMachoFile;
return new ByteArrayInputStream(tempOut.toByteArray());
}
}