Yagura menu NullPointerバグ対応

raise-isayan · Jun 12, 2023 · 06abb73 · 06abb73
1 parent 82661b7
commit 06abb73
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,5 @@
-netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
-release_version_major=3.0
-release_version_minor=4.0
-netbeans.license=mit
+netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
+release_version_major=3.0
+release_version_minor=4.1
+netbeans.license=mit
+netbeans.hint.jdkPlatform=JDK_17
diff --git a/release/YaguraExtension-v3.0.jar b/release/YaguraExtension-v3.0.jar
diff --git a/src/main/java/burp/BurpExtension.java b/src/main/java/burp/BurpExtension.java
@@ -589,7 +589,7 @@ protected final class MenuHander {
         public MenuHander(MontoyaApi api) {
             this.api = api;
 
-            JMenu yaguraMenu = new JMenu();
+            final JMenu yaguraMenu = new JMenu();
             yaguraMenu.setText("Yagura");
             yaguraMenu.setMnemonic(KeyEvent.VK_Y);
 
@@ -950,6 +950,9 @@ public void actionPerformed(ActionEvent e) {
             BurpConfig.CharacterSets burpCharset = BurpConfig.getCharacterSets(BurpConfig.CharacterSetMode.SPECIFIC_CHARACTER_SET, StandardCharsets.UTF_8.name());
             if (BurpConfig.isSupportApi(api, BurpConfig.SupportApi.BURPSUITE_USEROPTION)) {
                 burpCharset = BurpConfig.getCharacterSets(api);
+                if (burpCharset.getCharacterSet() == null) {
+                    burpCharset.setCharacterSet(StandardCharsets.UTF_8.name());
+                }
             }
 
             for (int i = 0; i < encodngList.size(); i++) {