From 9a4918213b9fee8deedc82a2afcef93d66d3ec8a Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Mon, 1 Feb 2021 19:33:40 -0500 Subject: [PATCH] GP-652 Minor correction and cleanup of CoffArchive support --- .../util/bin/format/coff/archive/CoffArchiveConstants.java | 7 ++----- .../util/bin/format/coff/archive/CoffArchiveHeader.java | 4 ++-- .../file/formats/coff/CoffArchiveFileSystemFactory.java | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveConstants.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveConstants.java index b60f817069..ce91eb0cc1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveConstants.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveConstants.java @@ -17,10 +17,7 @@ package ghidra.app.util.bin.format.coff.archive; public final class CoffArchiveConstants { - public final static String MAGIC = "!\n"; - public final static int MAGIC_LEN = MAGIC.length(); - public static final int MAGIC_LEN_CONST_EXPR = 8; + public static final String MAGIC = "!\n"; + public static final int MAGIC_LEN = MAGIC.length(); public static final byte[] MAGIC_BYTES = MAGIC.getBytes(); - - public final static String END_OF_HEADER_MAGIC = "'\n"; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveHeader.java index 807a692bdf..1e7ccb327a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveHeader.java @@ -47,8 +47,8 @@ public final class CoffArchiveHeader implements StructConverter { * @throws IOException */ public static boolean isMatch(ByteProvider provider) throws IOException { - return (provider.length() > 2) && CoffArchiveConstants.MAGIC.equals( - new String(provider.readBytes(0, CoffArchiveConstants.MAGIC_LEN))); + return (provider.length() > CoffArchiveConstants.MAGIC_LEN) && CoffArchiveConstants.MAGIC + .equals(new String(provider.readBytes(0, CoffArchiveConstants.MAGIC_LEN))); } /** diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/coff/CoffArchiveFileSystemFactory.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/coff/CoffArchiveFileSystemFactory.java index 14b1584788..d8a725f18d 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/coff/CoffArchiveFileSystemFactory.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/coff/CoffArchiveFileSystemFactory.java @@ -30,7 +30,7 @@ import utilities.util.ArrayUtilities; public class CoffArchiveFileSystemFactory implements GFileSystemFactoryFull, GFileSystemProbeBytesOnly { - public static final int PROBE_BYTES_REQUIRED = CoffArchiveConstants.MAGIC_LEN_CONST_EXPR; + public static final int PROBE_BYTES_REQUIRED = CoffArchiveConstants.MAGIC_LEN; @Override public CoffArchiveFileSystem create(FSRL containerFSRL, FSRLRoot targetFSRL,