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/GP-1-dragonmacher-theme-add-missing-return'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-05-14 05:53:30 -04:00
parent f84404aeb4 8f1bf3d7fb
commit 5369ea4151
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Ghidra/Framework/Gui/src/main/java/generic/theme/ThemePreferences.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,8 +47,15 @@ public class ThemePreferences {
else if (themeId.startsWith(DiscoverableGTheme.CLASS_PREFIX)) { else if (themeId.startsWith(DiscoverableGTheme.CLASS_PREFIX)) {
String className = themeId.substring(DiscoverableGTheme.CLASS_PREFIX.length()); String className = themeId.substring(DiscoverableGTheme.CLASS_PREFIX.length());
try { try {
Class<?> forName = Class.forName(className); ClassLoader loader = getClass().getClassLoader();
return (GTheme) forName.getDeclaredConstructor().newInstance(); Class<?> clazz = Class.forName(className, false, loader);
if (!GTheme.class.isAssignableFrom(clazz)) {
Msg.showError(GTheme.class, null, "Can't Load Previous Theme",
"Theme class name does not point to a GTheme instance: " + className);
return ThemeManager.getDefaultTheme();
}
return (GTheme) clazz.getDeclaredConstructor().newInstance();
} }
catch (Exception e) { catch (Exception e) {
Msg.showError(GTheme.class, null, "Can't Load Previous Theme", Msg.showError(GTheme.class, null, "Can't Load Previous Theme",

8
Ghidra/Framework/Gui/src/main/java/generic/theme/ThemeReader.java
View File

@@ -135,7 +135,15 @@ class ThemeReader extends AbstractThemeReader {
int indexOf = path.indexOf("images/"); int indexOf = path.indexOf("images/");
if (indexOf < 0) { if (indexOf < 0) {
Msg.error(this, "Unknown file: " + path); Msg.error(this, "Unknown file: " + path);
return;
} }
if (path.contains("..")) {
// We write the theme images to an 'images' dir under the zip root. No need for '..'
Msg.error(this, "Zip paths with '..' not allowed: " + path);
return;
}
String relativePath = path.substring(indexOf, path.length()); String relativePath = path.substring(indexOf, path.length());
File dir = Application.getUserSettingsDirectory(); File dir = Application.getUserSettingsDirectory();
File iconFile = new File(dir, relativePath); File iconFile = new File(dir, relativePath);

9
Ghidra/Framework/Gui/src/main/java/generic/theme/ThemeWriter.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -122,12 +122,17 @@ public class ThemeWriter {
} }
private void copyToZipFile(String dir, File iconFile, ZipOutputStream zos) throws IOException { private void copyToZipFile(String dir, File iconFile, ZipOutputStream zos) throws IOException {
// dir: MyTheme.theme/
// zip name: MyTheme.theme/images/myicon.png
ZipEntry entry = new ZipEntry(dir + "images/" + iconFile.getName()); ZipEntry entry = new ZipEntry(dir + "images/" + iconFile.getName());
zos.putNextEntry(entry); zos.putNextEntry(entry);
Files.copy(iconFile.toPath(), zos); Files.copy(iconFile.toPath(), zos);
} }
private void saveThemeFileToZip(String dir, ZipOutputStream zos) throws IOException { private void saveThemeFileToZip(String dir, ZipOutputStream zos) throws IOException {
// dir: MyTheme.theme/
// theme name: MyTheme
// zip name: MyTheme.theme/MyTheme.theme
ZipEntry entry = new ZipEntry(dir + theme.getName() + ".theme"); ZipEntry entry = new ZipEntry(dir + theme.getName() + ".theme");
zos.putNextEntry(entry); zos.putNextEntry(entry);
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(zos)); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(zos));