Ghidra is a software reverse engineering (SRE) framework
fix java.awt.headless=true inconsistently not being set
Ryosuke Takahashi4d12936a7ceb
diff --git a/Ghidra/RuntimeScripts/Linux/support/bsim b/Ghidra/RuntimeScripts/Linux/support/bsimindex a9ff1917e5..d4a1747f36 100755--- a/Ghidra/RuntimeScripts/Linux/support/bsim+++ b/Ghidra/RuntimeScripts/Linux/support/bsim@@ -18,4 +18,4 @@ VMARG_LIST="-Djava.awt.headless=true "SCRIPT_FILE="$(readlink -f "$0" 2>/dev/null || readlink "$0" 2>/dev/null || echo "$0")"SCRIPT_DIR="${SCRIPT_FILE%/*}"-${SCRIPT_DIR}/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"+${SCRIPT_DIR}/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "${VMARG_LIST}" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"diff --git a/Ghidra/RuntimeScripts/Linux/support/bsim_ctl b/Ghidra/RuntimeScripts/Linux/support/bsim_ctlindex 663c39db99..13edf3b316 100755--- a/Ghidra/RuntimeScripts/Linux/support/bsim_ctl+++ b/Ghidra/RuntimeScripts/Linux/support/bsim_ctl@@ -19,6 +19,6 @@ SCRIPT_DIR="${SCRIPT_FILE%/*}"# Some JVM's with class data sharing enabled have issues with BSim starting with Ghidra's custom# classloader, so we will disable sharing-VMARG_LIST="-Xshare:off"+VMARG_LIST+="-Xshare:off"${SCRIPT_DIR}/launch.sh $LAUNCH_MODE jdk "BSimControl" $MAXMEM "${VMARG_LIST}" ghidra.features.bsim.query.BSimControlLaunchable "$@"diff --git a/docker/entrypoint.sh b/docker/entrypoint.shindex e19a7372d1..f58f13454f 100755--- a/docker/entrypoint.sh+++ b/docker/entrypoint.sh@@ -35,7 +35,7 @@ elif [[ $MODE == "ghidra-server" ]] thenelif [[ $MODE == "bsim" ]] thenLAUNCH_MODE=${LAUNCH_MODE:=fg}VMARG_LIST=${VMARG_LIST:="-Djava.awt.headless=true "}- /ghidra/support/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"+ /ghidra/support/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "${VMARG_LIST}" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"elif [[ $MODE == "bsim-server" ]] thenLAUNCH_MODE=${LAUNCH_MODE:=fg}VMARG_LIST=${VMARG_LIST:="-Djava.awt.headless=true -Xshare:off"}