Fix test_tainted_integers_taint_stored_in_array regression test

Author: NathanJPhillips

regression/end_to_end/tainted-integers/test_tainted_integers.py

@@ -1,6 +1,5 @@
 import os
 import subprocess
-import pytest
 
 from regression.end_to_end.driver import run_security_analyser_pipeline
 import regression.utils as utils
@@ -42,12 +41,7 @@ def test_tainted_integers_single_function():
     assert traces.trace_exists("java::single_function.main:(I)V", 13)
 
 
-@pytest.mark.xfail(strict=True)
 def test_tainted_integers_taint_stored_in_array():
-    """
-    Fails without use of full-slicer (even without any slicer).
-    TODO: Find out why
-    """
     with utils.working_dir(os.path.abspath(os.path.dirname(__file__))):
         subprocess.call(["flock", ".build_lock", "ant", "compile4"])
     traces = run_security_analyser_pipeline(

src/taint-slicer/instrumenter.cpp

@@ -600,6 +600,20 @@ void taint_instrumentert::instrument_instructions_with_shadow_variables(
         }
       }
       break;
+    case OTHER:
+      if(instr_it->code.get_statement() == ID_array_set)
+      {
+        codet &code = instr_it->code;
+        code.op0() = drive_access_path_through_super_classes(code.op0());
+        INVARIANT(
+          can_cast_type<pointer_typet>(code.op0().type()),
+          "first argument to array_set must be of pointer type");
+        code.op1() = make_or_update_initialiser(
+          code.op1(),
+          ns.follow(code.op0().type().subtype()),
+          get_instrumented_symbol_table(),
+          get_names_of_shadow_variables());
+      }
     default:
       break;
     }