Merge pull request #12146 from jketema/global-indirect

jketema · web-flow · commit 8f15abc2854e · 2023-02-10T10:21:04.000+01:00
C++: Do not mark global indirect flow as spurious in dataflow tests
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp
@@ -563,18 +563,18 @@ namespace IndirectFlowThroughGlobals {
   }
 
   void f() {
-    sink(*globalInt); // $ ir=562:17 ir=576:17 // tainted or clean? Not sure.
+    sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17
     taintGlobal();
-    sink(*globalInt); // $ ir=562:17 MISSING: ast=562:17 SPURIOUS: ir=576:17
+    sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17
   }
 
   void calledAfterTaint() {
-    sink(*globalInt); // $ ir=576:17 MISSING: ast=576:17 SPURIOUS: ir=562:17
+    sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17
   }
 
   void taintAndCall() {
     globalInt = indirect_source();
     calledAfterTaint();
-    sink(*globalInt); // $ ir=576:17 MISSING: ast=576:17 SPURIOUS: ir=562:17
+    sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -563,18 +563,18 @@ namespace IndirectFlowThroughGlobals {`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`void f() {`
`566`		`- sink(*globalInt); // $ ir=562:17 ir=576:17 // tainted or clean? Not sure.`
	`566`	`+ sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17`
`567`	`567`	`taintGlobal();`
`568`		`- sink(*globalInt); // $ ir=562:17 MISSING: ast=562:17 SPURIOUS: ir=576:17`
	`568`	`+ sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`void calledAfterTaint() {`
`572`		`- sink(*globalInt); // $ ir=576:17 MISSING: ast=576:17 SPURIOUS: ir=562:17`
	`572`	`+ sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17`
`573`	`573`	`}`
`574`	`574`
`575`	`575`	`void taintAndCall() {`
`576`	`576`	`globalInt = indirect_source();`
`577`	`577`	`calledAfterTaint();`
`578`		`- sink(*globalInt); // $ ir=576:17 MISSING: ast=576:17 SPURIOUS: ir=562:17`
	`578`	`+ sink(*globalInt); // $ ir=562:17 ir=576:17 MISSING: ast=562:17 ast=576:17`
`579`	`579`	`}`
`580`		`-}`
	`580`	`+}`