Skip to content
This repository has been archived by the owner on Oct 1, 2023. It is now read-only.

PDB Build Breakage #23

Closed
MeFisto94 opened this issue Oct 7, 2020 · 3 comments
Closed

PDB Build Breakage #23

MeFisto94 opened this issue Oct 7, 2020 · 3 comments

Comments

@MeFisto94
Copy link

Commit NationalSecurityAgency/ghidra@b816f4a has some refactorings that mess up imports and potentially more.
I'll try to get it working locally and maybe submit a PR :)

@MeFisto94
Copy link
Author

Okay that was quick, another breakage stems from your PR to Ghidra.
The Changes are too small to mess with a PR, but here's a diff for your convenience:

diff --git a/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java b/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java
index aeffa13..95dfc64 100644
--- a/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java
+++ b/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java
@@ -7,7 +7,7 @@ import ghidra.app.cmd.data.rtti.Vtable;
 import ghidra.app.cmd.data.rtti.gcc.ClassTypeInfoUtils;
 import ghidra.app.cmd.function.CreateFunctionCmd;
 import ghidra.app.util.XReferenceUtil;
-import ghidra.app.util.bin.format.pdb.PdbProgramAttributes;
+import ghidra.app.util.pdb.PdbProgramAttributes;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.data.InvalidDataTypeException;
diff --git a/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java b/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java
index 4ac73f6..0123240 100644
--- a/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java
+++ b/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java
@@ -190,7 +190,7 @@ public final class RttiModelWrapper implements VsClassTypeInfo {

        @Override
        public String getIdentifier() {
-               return RttiAnalyzer.TYPE_INFO_STRING;
+               return RttiUtil.TYPE_INFO_STRING;
        }

        @Override

@astrelsky
Copy link
Owner

Thank you. I have a few local changes I haven't pushed yet that includes this. I'll try and get them through this morning. Alternatively if you wish to submit a pr I can merge it in now.

@astrelsky
Copy link
Owner

This should be fixed now. Thank you!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants