Fix NPE reported by Coverity (#24)

* Fix NPE in ArgsConfiguration * Join matcher checks together
teragrep · Nov 18, 2024 · 1b07c20 · 1b07c20
1 parent ac52f38
commit 1b07c20
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/teragrep/cnf_01/ArgsConfiguration.java b/src/main/java/com/teragrep/cnf_01/ArgsConfiguration.java
@@ -79,7 +79,7 @@ public Map<String, String> asMap() throws ConfigurationException {
             final Pattern ptn = Pattern.compile("([a-z]+)(=.+)");
             for (final String arg : args) {
                 final Matcher matcher = ptn.matcher(arg);
-                if (!matcher.matches()) {
+                if (!matcher.matches() || matcher.group(1) == null | matcher.group(2) == null) {
                     throw new ConfigurationException(
                             String
                                     .format(
@@ -88,6 +88,7 @@ public Map<String, String> asMap() throws ConfigurationException {
                                     )
                     );
                 }
+
                 map.put(matcher.group(1), matcher.group(2).substring(1));
             }
         }