From 22962564641b443dc445ef61312496ff38c6b384 Mon Sep 17 00:00:00 2001 From: Dominic Della Valle Date: Sat, 10 Jul 2021 04:46:07 -0400 Subject: [PATCH 1/2] Fix: handle whitespace paths for Windows launchers --- Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat | 2 +- Ghidra/RuntimeScripts/Windows/support/launch.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat b/Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat index bb2cf2596b..fc03892c5f 100644 --- a/Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat +++ b/Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat @@ -24,7 +24,7 @@ set "SERVER_DIR=%~dp0" set "SERVER_DIR=%SERVER_DIR:~0,-1%" rem Ensure Ghidra path doesn't contain illegal characters -if not %SERVER_DIR:!=%==%SERVER_DIR% ( +if not "%SERVER_DIR:!=%"=="%SERVER_DIR%" ( echo Ghidra path cannot contain a "!" character. exit /B 1 ) diff --git a/Ghidra/RuntimeScripts/Windows/support/launch.bat b/Ghidra/RuntimeScripts/Windows/support/launch.bat index b5ae0ca399..5f3069f770 100644 --- a/Ghidra/RuntimeScripts/Windows/support/launch.bat +++ b/Ghidra/RuntimeScripts/Windows/support/launch.bat @@ -39,7 +39,7 @@ set "SUPPORT_DIR=%~dp0" set "SUPPORT_DIR=%SUPPORT_DIR:~0,-1%" :: Ensure Ghidra path doesn't contain illegal characters -if not %SUPPORT_DIR:!=%==%SUPPORT_DIR% ( +if not "%SUPPORT_DIR:!=%"=="%SUPPORT_DIR%" ( echo Ghidra path cannot contain a "!" character. set ERRORLEVEL=1 goto exit1 From 57262c838d7a7cdae82188610585eada8d702651 Mon Sep 17 00:00:00 2001 From: Garrett Gu Date: Mon, 28 Jun 2021 17:52:56 -0500 Subject: [PATCH 2/2] Add missing parameter to format string --- .../main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java index 4ffe85b25c..b9711ba4ab 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java @@ -396,7 +396,7 @@ public class SleighCompile extends SleighBase { reportError(qual.location, String.format( "Size of bitfield %s=(%d,%d) larger than %d bits in context register '%s'", - qual.name, min, (8 * 4), sym.getName())); + qual.name, min, max, (8 * 4), sym.getName())); } if (max > maxBits) {