fix: NullPointerException in MSBuildAnalyzer (#5589)

jeremylong · Mar 23, 2023 · 3a28284 · 3a28284
1 parent 743ccf5
commit 3a28284
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/core/src/main/java/org/owasp/dependencycheck/analyzer/MSBuildProjectAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/MSBuildProjectAnalyzer.java
@@ -226,12 +226,15 @@ private Properties loadDirectoryBuildProps(File directory) throws MSBuildProject
         }
 
         final File directoryProps = locateDirectoryBuildFile(DIRECTORY_BUILDPROPS, directory);
-        final Map<String, String> entries = readDirectoryBuildProps(directoryProps);
+        if (directoryProps != null) {
+            final Map<String, String> entries = readDirectoryBuildProps(directoryProps);
 
-        for (Map.Entry<String, String> entry : entries.entrySet()) {
-            props.put(entry.getKey(), entry.getValue());
+            if (entries != null) {
+                for (Map.Entry<String, String> entry : entries.entrySet()) {
+                    props.put(entry.getKey(), entry.getValue());
+                }
+            }
         }
-
         return props;
     }
 
@@ -323,7 +326,7 @@ private Map<String, String> readDirectoryBuildProps(File directoryProps) throws
 
             for (String importStatement : imports) {
                 final File parentBuildProps = getImport(importStatement, directoryProps);
-                if (!directoryProps.equals(parentBuildProps)) {
+                if (parentBuildProps != null && !directoryProps.equals(parentBuildProps)) {
                     final Map<String, String> parentEntries = readDirectoryBuildProps(parentBuildProps);
                     if (parentEntries != null) {
                         parentEntries.putAll(entries);