Fix TranslationUnit.FileRelativeDirectory to be more robust against null include paths.

tritao · tritao · commit 568b68bb3fb3 · 2020-04-26T19:55:24.000+01:00
diff --git a/src/AST/TranslationUnit.cs b/src/AST/TranslationUnit.cs
@@ -62,7 +62,12 @@ public string FileRelativeDirectory
         {
             get
             {
-                if (fileRelativeDirectory != null) return fileRelativeDirectory;
+                if (fileRelativeDirectory != null)
+                    return fileRelativeDirectory;
+
+                if (IncludePath == null)
+                    return string.Empty;
+
                 var path = IncludePath.Replace('\\', '/');
                 var index = path.LastIndexOf('/');
                 return fileRelativeDirectory = path.Substring(0, index);

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,12 @@ public string FileRelativeDirectory`
`62`	`62`	`{`
`63`	`63`	`get`
`64`	`64`	`{`
`65`		`- if (fileRelativeDirectory != null) return fileRelativeDirectory;`
	`65`	`+ if (fileRelativeDirectory != null)`
	`66`	`+ return fileRelativeDirectory;`
	`67`	`+`
	`68`	`+ if (IncludePath == null)`
	`69`	`+ return string.Empty;`
	`70`	`+`
`66`	`71`	`var path = IncludePath.Replace('\\', '/');`
`67`	`72`	`var index = path.LastIndexOf('/');`
`68`	`73`	`return fileRelativeDirectory = path.Substring(0, index);`