Merge pull request #29 from kingthorin/npe-del-fix

Author: kingthorin

CHANGELOG.md

@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Maintenance changes.
 - The script example in the Help content was updated to use the injected core variables instead of using the fully qualified class name.
 
+### Fixed
+- An NPE which could happen when removing an entry that didn't yet have a tag assigned.
+
 ## [1.5.0] - 2022-07-11
 ### Added
 - A right-click context menu is now available in the History tab in order to Select/Set a color for arbitrary messages.

src/main/java/org/zaproxy/zap/extension/neonmarker/NeonmarkerPanel.java

@@ -316,7 +316,7 @@ private Component getRemoveButton(int ruleNumber) {
                         return;
                     }
                     String tag = colormap.get(ruleNumber).getTag();
-                    if (ExtensionNeonmarker.TAG_PATTERN.matcher(tag).matches()) {
+                    if (tag != null && ExtensionNeonmarker.TAG_PATTERN.matcher(tag).matches()) {
                         switch (getRemovalChoice()) {
                             case JOptionPane.CANCEL_OPTION:
                             case JOptionPane.CLOSED_OPTION:
@@ -332,19 +332,17 @@ private Component getRemoveButton(int ruleNumber) {
                                 return;
                         }
                     } else {
-                        colormap.remove(ruleNumber);
+                        removeMapping(ruleNumber);
                     }
                     refreshDisplay();
                 });
         return remove;
     }
 
     private void removeMapping(int ruleNumber) {
-        if (colormap.size() == 1) {
-            colormap.remove(ruleNumber);
+        colormap.remove(ruleNumber);
+        if (colormap.isEmpty()) {
             colormap.add(new ExtensionNeonmarker.ColorMapping());
-        } else {
-            colormap.remove(ruleNumber);
         }
     }