Merge pull request #8916 from ibuclaw/dmd-cxx-segfault

[dmd-cxx] Backport: Don't pass null pointer as format parameter to errorSupplemental
dlang · Nov 4, 2018 · 2001933 · 2001933
2 parents 497a814 + 2b2ba9c
commit 2001933
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/dmodule.c b/src/dmodule.c
@@ -312,7 +312,8 @@ bool Module::read(Loc loc)
         {
             ::error(loc, "cannot find source code for runtime library file 'object.d'");
             errorSupplemental(loc, "dmd might not be correctly installed. Run 'dmd -man' for installation instructions.");
-            errorSupplemental(loc, "config file: %s", FileName::canonicalName(global.inifilename));
+            const char *dmdConfFile = FileName::canonicalName(global.inifilename);
+            errorSupplemental(loc, "config file: %s", dmdConfFile ? dmdConfFile : "not found");
         }
         else
         {