mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
ghidra1
2021-07-13 14:35:33 -04:00
parent cf293853e8 fa3973b086
commit 245b57d69b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompile.java
View File

@@ -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) {

2
Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat
View File

@@ -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
)

2
Ghidra/RuntimeScripts/Windows/support/launch.bat
View File

@@ -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