Merge pull request #4 from nekohaku/master

Make a CI workflow file and fix an exception in modern Ghidra versions.
astrelsky · Dec 1, 2021 · 34f7f01 · 34f7f01
2 parents 1c39895 + 30c1e8b
commit 34f7f01
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,52 @@
+name: Build and publish
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ghidra: ["10.0.4"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@main
+        with:
+          java-version: '11'
+          java-package: jdk
+          architecture: x64
+          distribution: 'temurin'
+      - uses: er28-0652/setup-ghidra@master
+        with:
+          version: ${{ matrix.ghidra }}
+      - uses: actions/checkout@v2
+        with:
+          repository: astrelsky/Ghidra-Cpp-Class-Analyzer
+          path: Ghidra-Cpp-Class-Analyzer
+      - uses: eskatos/gradle-command-action@v2
+        with:
+          gradle-version: 6.9
+          build-root-directory: Ghidra-Cpp-Class-Analyzer
+          arguments: buildExtension -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }}
+      - name: Install the class analyzer as an extension forcefully
+        run: |
+           mkdir -p ~/.ghidra/.ghidra_${{ matrix.ghidra }}_PUBLIC/Extensions/
+           unzip Ghidra-Cpp-Class-Analyzer/dist/*.zip -d ~/.ghidra/.ghidra_${{ matrix.ghidra }}_PUBLIC/Extensions/
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Ghidra-Cpp-Class-Analyzer
+          path: Ghidra-Cpp-Class-Analyzer/dist/*.zip
+          if-no-files-found: warn
+      - name: Cleanup
+        run: rm -rf Ghidra-Cpp-Class-Analyzer
+      - uses: eskatos/gradle-command-action@v2
+        with:
+          gradle-version: 6.9
+          arguments: buildExtension -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: GhidraOrbis
+          path: dist/*.zip
+          if-no-files-found: warn
+
+
diff --git a/src/main/java/ghidra/app/util/bin/format/elf/DefaultElfHeader.java b/src/main/java/ghidra/app/util/bin/format/elf/DefaultElfHeader.java
@@ -15,7 +15,8 @@
 
 public class DefaultElfHeader extends ElfHeader {
 
-	protected DefaultElfHeader() {
+	public DefaultElfHeader() {
+		super();
 	}
 
 	//////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/main/java/ghidra/app/util/bin/format/elf/DefaultElfProgramHeader.java b/src/main/java/ghidra/app/util/bin/format/elf/DefaultElfProgramHeader.java
@@ -6,7 +6,8 @@
 
 public class DefaultElfProgramHeader extends ElfProgramHeader {
 
-	protected DefaultElfProgramHeader() {
+	public DefaultElfProgramHeader() {
+		super();
 	}
 
 	public static ElfProgramHeader createElfProgramHeader(FactoryBundledWithBinaryReader reader,

diff --git a/src/main/java/ghidra/app/util/bin/format/elf/DefaultElfSymbolTable.java b/src/main/java/ghidra/app/util/bin/format/elf/DefaultElfSymbolTable.java
@@ -8,7 +8,8 @@
 
 public class DefaultElfSymbolTable extends ElfSymbolTable {
 
-	protected DefaultElfSymbolTable() {
+	public DefaultElfSymbolTable() {
+		super();
 	}
 
 	public static ElfSymbolTable createElfSymbolTable(FactoryBundledWithBinaryReader reader,

diff --git a/src/main/java/orbis/elf/OrbisElfHeader.java b/src/main/java/orbis/elf/OrbisElfHeader.java
@@ -34,7 +34,8 @@ public class OrbisElfHeader extends ElfHeader {
     public static final short ET_SCE_DYNAMIC = (short) 0xFE18;
 	public static final short ET_SCE_KERNEL = 2;
 
-	protected OrbisElfHeader() {
+	public OrbisElfHeader() {
+		super();
 	}
 
 	public static OrbisElfHeader createElfHeader(GenericFactory factory, ByteProvider provider)