Minor fixes and docker update

.github/workflows/docker-build-publish.yaml

@@ -1,5 +1,8 @@
 name: Docker-PyPi-Build-Publish
 
+# this workflow will publish the latest ghidriff image from the repo Dockerfile
+# it will match the release based on the most recent release in pypi
+
 # This workflow uses actions that are not certified by GitHub.
 # They are provided by a third-party and are governed by
 # separate terms of service, privacy policy, and support
@@ -89,7 +92,8 @@ jobs:
  push: ${{ github.event_name != 'pull_request' }}
  tags: ${{ steps.meta.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
- cache-from: type=gha
+ # cache-from: type=gha
+ no-cache: true
  cache-to: type=gha,mode=max
  platforms: linux/amd64,linux/arm64 
 

Dockerfile

@@ -1,5 +1,5 @@
 # From https://github.com/clearbluejar/ghidra-python
-FROM ghcr.io/clearbluejar/ghidra-python:10.4ghidra3.11python-bookworm
+FROM ghcr.io/clearbluejar/ghidra-python:11.0.1ghidra3.11python-bookworm
 
 ENV GHIDRA_INSTALL_DIR=/ghidra
 

ghidriff/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.6.2'
+__version__ = '0.6.3'
 __author__ = 'clearbluejar'
 
 # Expose API

ghidriff/ghidra_diff_engine.py

@@ -339,11 +339,12 @@ def enhance_sym(self, sym: 'ghidra.program.model.symbol.Symbol', thread_id: int
 
  for block in basic_blocks:
  code_units = func.getProgram().getListing().getCodeUnits(block, True)
+ units = []
  for code in code_units:
- blocks.append(str(code.mnemonicString))
+ units.append(str(code.mnemonicString))
 
- # sort - This case handles the case for compiler optimizations
- blocks = sorted(blocks)
+  # sort - This case handles the case for compiler optimizations
+  blocks.extend(sorted(units))
 
  if not func.external:
  error, code = self.decompile_func(func.program, func, timeout,)