Merge pull request diffblue#339 from diffblue/bugfix/dump_plots_only_when_explicitly_requested

SEC-16: Taint slicer: Dump of call graph SVGs under only when HTML dump is on.

Author: marek-trtik

src/taint-analysis/taint_security_scanner.cpp

@@ -183,10 +183,10 @@ bool taint_do_security_scan(
 
     if(config.is_html_dump_of_program_slice_enabled())
     {
+      const boost::filesystem::path results_dir =
+        config.get_slicer_root_directory();
       const std::string svg_path =
-        (boost::filesystem::path(config.get_slicer_root_directory()) /
-         "tokens_propagation_graph.svg")
-        .native();
+        (results_dir / "tokens_propagation_graph.svg").native();
 
       logger.status()
         << "Saving tokens propagation graph (see '"
@@ -195,6 +195,15 @@ bool taint_do_security_scan(
       taint_dump_as_svg(
         *tokens_propagation_graph_ptr,
         svg_path);
+
+      logger.status() << "Saving call graph." << messaget::eom;
+      dump_callgraph_in_svg(
+        program.get_call_graph(),
+        (results_dir / "call_graph.svg").native());
+      logger.status() << "Saving inverted call graph." << messaget::eom;
+      dump_callgraph_in_svg(
+        program.get_inverted_call_graph(),
+        (results_dir / "inverted_call_graph.svg").native());
     }
 
     if(config.is_html_dump_of_summaries_enabled())

src/taint-slicer/slicer.cpp

@@ -130,11 +130,4 @@ void taint_slicert::compute_slice(
       (results_dir / "instrumented_goto_programs.json").native());
     ostr << jtasks;
   }
-
-  dump_callgraph_in_svg(
-    program->get_call_graph(),
-    (results_dir / "call_graph.svg").native());
-  dump_callgraph_in_svg(
-    program->get_inverted_call_graph(),
-    (results_dir / "inverted_call_graph.svg").native());
 }