fix possible NPE

cflint · Aug 10, 2017 · 2213e3b · 2213e3b
1 parent db76d2d
commit 2213e3b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/com/cflint/main/CFLintMain.java b/src/main/java/com/cflint/main/CFLintMain.java
@@ -392,19 +392,20 @@ private void ui() {
     private static CFLintConfig loadConfig(final String configfile) {
         if (configfile != null) {
             try {
-                CFLintPluginInfo pluginInfo=null;
+                CFLintPluginInfo pluginInfo = null;
                 if (configfile.toLowerCase().endsWith(".xml")) {
                     final Object configObj = ConfigUtils.unmarshal(new FileInputStream(configfile));
                     if (configObj instanceof CFLintPluginInfo)
-                        pluginInfo= (CFLintPluginInfo) configObj;
+                        pluginInfo = (CFLintPluginInfo) configObj;
                     else if(configObj instanceof CFLintConfig ){
                         return (CFLintConfig) configObj;
                     }
                 } else {
                     return ConfigUtils.unmarshalJson(new FileInputStream(configfile), CFLintConfig.class);
                 }
                 CFLintConfig returnVal = new CFLintConfig();
-                returnVal.setRules(pluginInfo.getRules());
+                if (pluginInfo != null)
+                    returnVal.setRules(pluginInfo.getRules());
                 return returnVal;
             } catch (final Exception e) {
                 System.err.println("Unable to load config file. " + e.getMessage());