From 1b9cf4a274ee4cf480e33ccb8b5f59e2b227513c Mon Sep 17 00:00:00 2001 From: ghizard <50744617+ghizard@users.noreply.github.com> Date: Wed, 9 Sep 2020 16:24:02 -0400 Subject: [PATCH] GT-3112 - PDB Universal Reader/Analyzer - 121 commits --- .../ghidra/app/util/pdb/pdbapplicator/MsSymbolApplier.java | 7 +++---- .../ghidra/app/util/pdb/pdbapplicator/PdbResearch.java | 2 +- .../app/util/bin/format/pdb2/pdbreader/PdbByteWriter.java | 2 +- .../util/bin/format/pdb2/pdbreader/symbol/SymbolsTest.java | 7 ++----- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MsSymbolApplier.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MsSymbolApplier.java index 78c67eb752..d48d76bf2d 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MsSymbolApplier.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/MsSymbolApplier.java @@ -43,7 +43,7 @@ public abstract class MsSymbolApplier { */ public MsSymbolApplier(PdbApplicator applicator, AbstractMsSymbolIterator iter) { Objects.requireNonNull(applicator, "applicator cannot be null"); - Objects.requireNonNull(iter, "symbolGroup cannot be null"); + Objects.requireNonNull(iter, "iter cannot be null"); this.applicator = applicator; this.iter = iter; currentOffset = iter.getCurrentOffset(); @@ -76,13 +76,12 @@ public abstract class MsSymbolApplier { /** * Applies logic of this class to another {@link MsSymbolApplier} instead of to - * "the program." + * the program. * @param applyToApplier the applier to which the logic of this class is applied. * @throws PdbException if there was a problem processing the data. * @throws CancelledException upon user cancellation. */ - abstract void applyTo(MsSymbolApplier applyToApplier) - throws PdbException, CancelledException; + abstract void applyTo(MsSymbolApplier applyToApplier) throws PdbException, CancelledException; /** * Manages block nesting for symbols/appliers that represent the beginning or end of blocks. diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbResearch.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbResearch.java index 2723897857..e42eb782eb 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbResearch.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PdbResearch.java @@ -32,7 +32,7 @@ import mdemangler.*; import mdemangler.object.MDObjectCPP; /** - * This is a class for develop research into various areas. Anything in this class that needs to + * This class is for developer research into various areas. Anything in this class that needs to * end up as part of any usable output should be moved into another class. This class just * aggregates various items being investigated, and will eventually be eliminated from the code * base. diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbByteWriter.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbByteWriter.java index cbb7e39c73..a2d60bffaf 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbByteWriter.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/PdbByteWriter.java @@ -253,7 +253,7 @@ public class PdbByteWriter { public void putGUID(int data1, short data2, short data3, byte[] data4) { if (data4.length != 8) { String msg = "GUID invalid byte[] size... terminating"; - Msg.error(null, msg); + Msg.error(this, msg); throw new AssertException(msg); } putInt(data1); diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/symbol/SymbolsTest.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/symbol/SymbolsTest.java index 0256333492..c93d522862 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/symbol/SymbolsTest.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/bin/format/pdb2/pdbreader/symbol/SymbolsTest.java @@ -16,6 +16,7 @@ package ghidra.app.util.bin.format.pdb2.pdbreader.symbol; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.math.BigInteger; @@ -26,8 +27,6 @@ import generic.test.AbstractGenericTest; import ghidra.app.util.bin.format.pdb2.pdbreader.*; import ghidra.app.util.bin.format.pdb2.pdbreader.type.AbstractMsType; import ghidra.app.util.bin.format.pdb2.pdbreader.type.DummyMsType; -import ghidra.util.Msg; -import ghidra.util.exception.AssertException; public class SymbolsTest extends AbstractGenericTest { @@ -63,9 +62,7 @@ public class SymbolsTest extends AbstractGenericTest { dummyPdb700.setItemRecord(4096, item); } catch (Exception e) { - String msg = "Error in static initialization of testt: " + e; - Msg.error(null, msg); - throw new AssertException(msg); + fail("Error in static initialization of test: " + e); } }