Fixed #50, improved #49

yhs0602 · Apr 29, 2019 · cba0a25 · cba0a25
1 parent 5931abb
commit cba0a25
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 44 deletions.
diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin
diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock
diff --git a/.gradle/5.1.1/javaCompile/classAnalysis.bin b/.gradle/5.1.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/5.1.1/javaCompile/javaCompile.lock b/.gradle/5.1.1/javaCompile/javaCompile.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/AbstractFile.java b/app/src/main/java/com/kyhsgeekcode/disassembler/AbstractFile.java
@@ -63,7 +63,10 @@ public String toString() {
         if (fileContents == null) {
             return "The file has not been configured. You should setup manually in the first page before you can see the details.";
         }
-		StringBuilder builder=new StringBuilder("");
+		StringBuilder builder = new StringBuilder(this instanceof RawFile ?
+				"The file has not been configured. You should setup manually in the first page before you can see the details."
+						+ System.lineSeparator()
+				: "");
 		builder.append(/*R.getString(R.string.FileSize)*/"File Size:").append(Integer.toHexString(fileContents.length))
 		.append(ls);
 		builder.append(MainActivity.context.getString(R.string.FoffsCS)).append(Long.toHexString(codeBase))

diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/MainActivity.java b/app/src/main/java/com/kyhsgeekcode/disassembler/MainActivity.java
@@ -2177,12 +2177,12 @@ private void AfterReadFully(File file) throws IOException {
                 AfterParse();
             } catch (NotThisFormatException f) {
                 ShowAlertDialog(this, "Failed to parse the file. please setup manually.", "");
-                setParsedFile(new RawFile(file));
+                setParsedFile(new RawFile(file, filecontent));
                 AllowRawSetup();
                 //failed to parse the file. please setup manually.
             } catch (Exception g) {
                 AlertError("Unexpected exception: failed to parse the file. please setup manually.", g);
-                setParsedFile(new RawFile(file));
+                setParsedFile(new RawFile(file, filecontent));
                 AllowRawSetup();
             }
         }

diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/PEFile.java b/app/src/main/java/com/kyhsgeekcode/disassembler/PEFile.java
@@ -12,6 +12,7 @@
 import org.boris.pecoff4j.RVAConverter;
 import org.boris.pecoff4j.io.PEParser;
 
+import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -28,9 +29,10 @@ public PEFile(File file, byte[] filec) throws IOException, NotThisFormatExceptio
 	{
 		try {
 			pe = PEParser.parse(file);
-		}catch(NegativeArraySizeException e)
-		{
+		}catch(NegativeArraySizeException e) {
 			throw new NotThisFormatException(/*"PECOFFJ's Parser threw an exception."*/);
+		} catch (EOFException e) {
+			throw new RuntimeException("The PE parser threw EOFException. The file may be corrupted.");
 		}
 		if (pe == null || pe.getSignature() == null || !pe.getSignature().isValid())
 		{

diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/RawFile.java b/app/src/main/java/com/kyhsgeekcode/disassembler/RawFile.java
@@ -1,12 +1,11 @@
 package com.kyhsgeekcode.disassembler;
 
-import java.io.*;
+import java.io.File;
 
 public class RawFile extends AbstractFile
 {
-	public RawFile(File file)
-	{
-
+	public RawFile(File file, byte[] filecontent) {
+		this.fileContents = filecontent;
 	}
 
 }