Merge pull request diffblue#370 from diffblue/bugfix/save_DOT_and_SVG_of_tokens_propagation_graph_on_right_conditions

Saving DOT file of tokens propagation graph always, and SVG only with debug HTML dump.

Author: marek-trtik

src/taint-analysis/taint_security_scanner.cpp

@@ -91,6 +91,13 @@ bool taint_do_security_scan(
       tokens_propagation_graph_ptr=
         std::unique_ptr<taint_tokens_propagation_grapht>(
           new taint_tokens_propagation_grapht(*transition_rules, named_tokens));
+      {
+        std::fstream ostr(
+          (boost::filesystem::path(config.get_slicer_root_directory()) /
+            "tokens_propagation_graph.dot").native(),
+          std::ios_base::out);
+        taint_to_dot(*tokens_propagation_graph_ptr, ostr);
+      }
     }
 
     object_numberingt numbering;
@@ -191,7 +198,11 @@ bool taint_do_security_scan(
       const boost::filesystem::path results_dir =
         config.get_slicer_root_directory();
 
-      const auto ignore = std::system(
+      logger.status()
+        << "Saving propagation chains graph (see '"
+        << results_dir / "propagation_chains.svg"
+        << "')." << messaget::eom;
+      auto ignore = std::system(
         (std::string("dot -Tsvg \"") +
          (results_dir / "propagation_chains.dot").native() + "\" -o \"" +
          (results_dir / "propagation_chains.svg").native() + "\"")
@@ -208,9 +219,15 @@ bool taint_do_security_scan(
         << "Saving tokens propagation graph (see '"
         << svg_path
         << "')." << messaget::eom;
-      taint_dump_as_svg(
-        *tokens_propagation_graph_ptr,
-        svg_path);
+      ignore = std::system(
+        (std::string("dot -Tsvg \"") +
+         (results_dir / "tokens_propagation_graph.dot").native() + "\" -o \"" +
+         (results_dir / "tokens_propagation_graph.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.
 
       logger.status() << "Saving call graph." << messaget::eom;
       dump_callgraph_in_svg(

src/taint-analysis/taint_tokens_propagation_graph.cpp

@@ -292,26 +292,3 @@ std::ostream &taint_to_dot(
 
   return ostr;
 }
-
-void taint_dump_as_svg(
-  const taint_tokens_propagation_grapht &graph,
-  std::string const&  svg_file_pathname)
-{
-  const std::string 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;
-    taint_to_dot(graph, ostr);
-  }
-
-  const std::string command =
-    msgstream() << "dot -Tsvg \"" << dot_filename
-                << "\" -o \"" << svg_file_pathname << "\"";
-  const auto result=std::system(command.c_str());
-  if(result!=0)
-    std::cerr << "ERROR in 'taint_dump_as_svg()' : std::system(" << command
-              << ") returned value " << result << ".";
-}

src/taint-analysis/taint_tokens_propagation_graph.h

@@ -131,8 +131,4 @@ std::ostream &taint_to_dot(
   const taint_tokens_propagation_grapht &graph,
   std::ostream &ostr);
 
-void taint_dump_as_svg(
-  const taint_tokens_propagation_grapht &graph,
-  std::string const&  svg_file_pathname);
-
 #endif