Merge pull request #1655 from lf-lang/fix-lfc-npe

Fix NPE in lfc error reporting
lf-lang · Mar 16, 2023 · a78d86b · a78d86b
2 parents 4c4b411 + 3e2824a
commit a78d86b
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/org.lflang/src/org/lflang/cli/CliBase.java b/org.lflang/src/org/lflang/cli/CliBase.java
@@ -207,26 +207,29 @@ public void validateResource(Resource resource) {
         assert resource != null;
 
         List<Issue> issues = this.validator.validate(
-                resource, CheckMode.ALL, CancelIndicator.NullImpl);
+            resource, CheckMode.ALL, CancelIndicator.NullImpl);
 
         for (Issue issue : issues) {
             // Issues may also relate to imported resources.
-            URI uri = issue.getUriToProblem(); 
-            try {
-                issueCollector.accept(
-                        new LfIssue(
-                            issue.getMessage(),
-                            issue.getSeverity(),
-                            issue.getLineNumber(),
-                            issue.getColumn(),
-                            issue.getLineNumberEnd(),
-                            issue.getColumnEnd(),
-                            issue.getLength(),
-                            FileUtil.toPath(uri)));
-            } catch (IOException e) {
-                reporter.printError(
-                        "Unable to convert '" + uri + "' to path." + e);
+            URI uri = issue.getUriToProblem();
+            Path path = null;
+            if (uri != null) {
+                try {
+                    path = FileUtil.toPath(uri);
+                } catch (IOException e) {
+                    reporter.printError("Unable to convert '" + uri + "' to path." + e);
+                }
             }
+            issueCollector.accept(
+                new LfIssue(
+                    issue.getMessage(),
+                    issue.getSeverity(),
+                    issue.getLineNumber(),
+                    issue.getColumn(),
+                    issue.getLineNumberEnd(),
+                    issue.getColumnEnd(),
+                    issue.getLength(),
+                    path));
         }
     }