Merge pull request diffblue#361 from diffblue/conditional_dump_of_svg_of_propagation_chains

Building SVG of the propagation chains graph only if HTML dump is on.

Author: marek-trtik

src/taint-analysis/taint_security_scanner.cpp

@@ -190,6 +190,17 @@ bool taint_do_security_scan(
     {
       const boost::filesystem::path results_dir =
         config.get_slicer_root_directory();
+
+      const auto ignore = std::system(
+        (std::string("dot -Tsvg \"") +
+         (results_dir / "propagation_chains.dot").native() + "\" -o \"" +
+         (results_dir / "propagation_chains.svg").native() + "\"")
+          .c_str());
+      (void)ignore; // We do not care about the return value, because
+                    // if the call fails, then the link to the SVG
+                    // image in the debug HTML output won't work.
+                    // That is all.
+
       const std::string svg_path =
         (results_dir / "tokens_propagation_graph.svg").native();
 

src/taint-slicer/propagation_chains.cpp

@@ -500,25 +500,14 @@ std::ostream &to_dot(
   return ostr;
 }
 
-void dump_as_svg(
+void to_dot(
   const taint_propagation_chainst &chains,
-  const std::string &svg_file_pathname)
+  const std::string &dot_file_pathname)
 {
-  std::string const  dot_filename =
-    boost::filesystem::path(svg_file_pathname).replace_extension("dot")
-    .native();
-  {
-    std::fstream  ostr(dot_filename, std::ios_base::out);
-    if (!ostr.is_open())
-        return;
-    to_dot(chains,ostr);
-  }
-
-  std::string const  command =
-      msgstream() << "dot -Tsvg \"" << dot_filename
-                  << "\" -o \"" << svg_file_pathname << "\"";
-  const auto x=std::system(command.c_str());
-  (void)x;
+  std::fstream ostr(dot_file_pathname, std::ios_base::out);
+  if(!ostr.is_open())
+    return;
+  to_dot(chains, ostr);
 }
 
 std::ostream &operator<<(std::ostream &ostr, const argidx_and_tokennamet &atp)

src/taint-slicer/propagation_chains.h

@@ -263,8 +263,8 @@ std::ostream &to_dot(
   const taint_propagation_chainst &chains,
   std::ostream &ostr);
 
-void dump_as_svg(
+void to_dot(
   const taint_propagation_chainst &chains,
-  const std::string &svg_file_pathname);
+  const std::string &dot_file_pathname);
 
 #endif

src/taint-slicer/slicer.cpp

@@ -73,9 +73,7 @@ void taint_slicert::compute_slice(
     map_from_functions_to_rule_application_sites,
     statistics);
 
-  dump_as_svg(
-    propagation_chains,
-    (results_dir / "propagation_chains.svg").native());
+  to_dot(propagation_chains, (results_dir / "propagation_chains.dot").native());
 
   std::vector<taint_instrumentation_propst> instrumentation_props;
   taint_build_instrumentation_props(