mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-10-22 18:22:23 -09:00
Code Issues Packages Projects Releases Wiki Activity

GT-3146: Preventing Ghidra from launching with 32-bit Java (fixes #882).

Browse Source
This commit is contained in:
Ryan Kurtz
2019-09-12 09:40:36 -04:00
parent d9da0f0b66
commit 0a3574d0c0
6 changed files with 93 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
View File

@@ -224,10 +224,11 @@ public class LaunchSupport {
javaRange = min + "-" + max;
}
System.out.println("*******************************************************");
System.out.println("******************************************************************");
System.out.println(
javaName + " " + javaRange + " could not be found and must be manually chosen!");
System.out.println("*******************************************************");
javaName + " " + javaRange + " (" + javaConfig.getSupportedArchitecture() +
"-bit) could not be found and must be manually chosen!");
System.out.println("******************************************************************");
File javaHomeDir = null;
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
@@ -259,7 +260,7 @@ public class LaunchSupport {
}
System.out.println(
"Java version " + javaVersion + " is outside of supported range: [" +
javaRange + "]");
javaRange + " " + javaConfig.getSupportedArchitecture() + "-bit]");
}
catch (FileNotFoundException e) {
System.out.println(