gcov: do not ICE on NULL string in JSON export.

2018-11-27  Martin Liska  <mliska@suse.cz>

	* gcov.c (generate_results): Append current_working_directory
	only when exists.

From-SVN: r266521

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ca260ec47cd2d89aa62e00564eeee31522cc671..c2eea0dcb0ae1bf426967bbf56903157e22464ed 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-27  Martin Liska  <mliska@suse.cz>
+
+       * gcov.c (generate_results): Append current_working_directory
+       only when exists.
+
 2018-11-27  Mike Gulick  <mgulick@mathworks.com>
 
        PR preprocessor/83173

diff --git a/gcc/gcov.c b/gcc/gcov.c
index 361b696ea786e56bce0afcee3b14c7fbb7a2b688..7e39f9bd57e59e8f2bf2b677c6c8f5fc5088b4f3 100644 (file)
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1377,7 +1377,9 @@ generate_results (const char *file_name)
   json::object *root = new json::object ();
   root->set ("format_version", new json::string ("1"));
   root->set ("gcc_version", new json::string (version_string));
-  root->set ("current_working_directory", new json::string (bbg_cwd));
+
+  if (bbg_cwd != NULL)
+    root->set ("current_working_directory", new json::string (bbg_cwd));
 
   json::array *json_files = new json::array ();
   root->set ("files", json_files);