Merge pull request diffblue#340 from diffblue/bugfix/dump_instrumented_program_in_html_only_if_requested

SEC-249: Propagation of 'dump-in-HTML' flag to the 'slicing_tasks_builder'.

Author: marek-trtik

src/taint-analysis/taint_security_scanner.cpp

@@ -177,7 +177,8 @@ bool taint_do_security_scan(
         (boost::filesystem::path(config.get_temp_root_directory()) / "SLICER")
           .native(),
         &statistics,
-        &logger);
+        &logger,
+        config.is_html_dump_of_program_slice_enabled());
       slicer.compute_slice(config.use_data_flow_insensitive_instrumentation());
     }
 

src/taint-slicer/slicer.cpp

@@ -26,7 +26,8 @@ taint_slicert::taint_slicert(
   const boost::filesystem::path &results_dir,
   const boost::filesystem::path &temp_dir,
   taint_statisticst * const statistics,
-  messaget * const logger)
+  messaget * const logger,
+  const bool perform_html_dump)
   : program(program)
   , numbering(numbering)
   , named_tokens(named_tokens)
@@ -37,6 +38,7 @@ taint_slicert::taint_slicert(
   , temp_dir(temp_dir)
   , statistics(statistics)
   , logger(logger)
+  , perform_html_dump(perform_html_dump)
 {
   boost::filesystem::create_directory(this->results_dir);
   boost::filesystem::create_directory(this->temp_dir);
@@ -110,7 +112,8 @@ void taint_slicert::compute_slice(
         i,
         program,
         statistics,
-        logger);
+        logger,
+        perform_html_dump);
     if(task_valid.second.empty())
       sliced_goto_programs.push_back(task_valid.first);
     else

src/taint-slicer/slicer.h

@@ -31,7 +31,8 @@ class taint_slicert
     const boost::filesystem::path &results_dir,
     const boost::filesystem::path &temp_dir,
     taint_statisticst * const statistics,
-    messaget * const logger);
+    messaget * const logger,
+    const bool perform_html_dump);
 
   /*******************************************************************\
 
@@ -67,6 +68,7 @@ class taint_slicert
   boost::filesystem::path temp_dir;
   taint_statisticst *statistics;
   messaget *logger;
+  bool perform_html_dump;
 };
 
 #endif

src/taint-slicer/slicing_tasks_builder.cpp

@@ -139,7 +139,8 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
   const std::size_t task_id,
   const taint_programt * const program,
   taint_statisticst * const statistics,
-  messaget * const logger)
+  messaget * const logger,
+  const bool perform_html_dump)
 {
   // The pathname of the output GOTO program binary file of the slicing task.
   const auto pathname=
@@ -273,6 +274,7 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
     goto_functions.update();
 
     // Dump the instrumented GOTO program in HTML (symbol table and functions)
+    if(perform_html_dump)
     {
       const auto dump_dir = output_dir / to_file_name(props.get_root());
       dump_symbol_table_in_html(symbol_table, dump_dir);

src/taint-slicer/slicing_tasks_builder.h

@@ -78,7 +78,8 @@ std::pair<taint_slicing_taskt,std::string> build_slicing_task(
   const std::size_t task_id,
   const taint_programt * const program,
   taint_statisticst * const statistics,
-  messaget * const logger);
+  messaget * const logger,
+  const bool perform_html_dump);
 
 void dump_as_json(const taint_slicing_taskt &task, json_objectt &out);