C++: Respond to review comments.

MathiasVP · MathiasVP · commit b249777bfb48 · 2020-11-13T10:44:06.000+01:00
diff --git a/cpp/ql/src/Likely Bugs/OO/UnsafeUseOfThis.ql b/cpp/ql/src/Likely Bugs/OO/UnsafeUseOfThis.ql
@@ -98,14 +98,14 @@ predicate isSource(InitializeParameterInstruction init, string msg, Class c) {
  * Holds if `instr` flows to a sink (which is a use of the value of `instr` as a `this` pointer
  * of type `sinkClass`).
  */
-predicate flowsToSink(Instruction instr, Instruction sink, Class sinkClass) {
+predicate flowsToSink(Instruction instr, Instruction sink) {
   flowsFromSource(instr) and
   (
-    isSink(instr, _, sinkClass) and instr = sink
+    isSink(instr, _, _) and instr = sink
     or
     exists(Instruction mid |
       successor(instr, mid) and
-      flowsToSink(mid, sink, sinkClass)
+      flowsToSink(mid, sink)
     )
   )
 }
@@ -193,14 +193,14 @@ predicate flows(
   Class sinkClass
 ) {
   isSource(source, msg, sourceClass) and
-  flowsToSink(source, sink, sinkClass) and
+  flowsToSink(source, sink) and
   isSink(sink, call, sinkClass)
 }
 
-query predicate edges(Instruction a, Instruction b) { successor(a, b) and flowsToSink(b, _, _) }
+query predicate edges(Instruction a, Instruction b) { successor(a, b) and flowsToSink(b, _) }
 
 query predicate nodes(Instruction n, string key, string val) {
-  flowsToSink(n, _, _) and
+  flowsToSink(n, _) and
   key = "semmle.label" and
   val = n.toString()
 }
diff --git a/cpp/ql/test/query-tests/Critical/UnsafeUseOfThis/test.cpp b/cpp/ql/test/query-tests/Critical/UnsafeUseOfThis/test.cpp
@@ -4,47 +4,47 @@ struct B;
 void call_f(B*);
 
 struct B : public A {
-	B() {
-		call_f(this);
-	}
+  B() {
+    call_f(this);
+  }
 
-    B(B& b) {
-        b.f(); // BAD: undefined behavior
-    }
+  B(B& b) {
+    b.f(); // BAD: undefined behavior
+  }
 
-	~B() {
-		f(); // BAD: undefined behavior
-	}
+  ~B() {
+    f(); // BAD: undefined behavior
+  }
 };
 
 struct C : public B {
-	C(bool b) {
-		call_f(this);
+  C(bool b) {
+    call_f(this);
 
-		if(b) {
-			this->f(); // GOOD: Not a 'must' flow
-		}
-	}
+    if(b) {
+      this->f(); // GOOD: Not a 'must' flow
+    }
+  }
 };
 
 struct D : public B {
-    D() : B(*this) {}
+  D() : B(*this) {}
 };
 
 void call_f(B* x) {
-	x->f(); // 2 x BAD: Undefined behavior
+  x->f(); // 2 x BAD: Undefined behavior
 }
 
 struct E : public A {
-	E() {
-		f(); // GOOD: Will call `E::f`
-	}
+  E() {
+    f(); // GOOD: Will call `E::f`
+  }
 
-	void f() override {}
+  void f() override {}
 };
 
 struct F : public E {
-	F() {
-		((A*)this)->f(); // BAD: undefined behavior
-	}
+  F() {
+    ((A*)this)->f(); // BAD: undefined behavior
+  }
 };

Original file line number	Diff line number	Diff line change
`@@ -98,14 +98,14 @@ predicate isSource(InitializeParameterInstruction init, string msg, Class c) {`
`98`	`98`	* Holds if `instr` flows to a sink (which is a use of the value of `instr` as a `this` pointer
`99`	`99`	* of type `sinkClass`).
`100`	`100`	`*/`
`101`		`-predicate flowsToSink(Instruction instr, Instruction sink, Class sinkClass) {`
	`101`	`+predicate flowsToSink(Instruction instr, Instruction sink) {`
`102`	`102`	`flowsFromSource(instr) and`
`103`	`103`	`(`
`104`		`- isSink(instr, _, sinkClass) and instr = sink`
	`104`	`+ isSink(instr, _, _) and instr = sink`
`105`	`105`	`or`
`106`	`106`	`exists(Instruction mid \|`
`107`	`107`	`successor(instr, mid) and`
`108`		`- flowsToSink(mid, sink, sinkClass)`
	`108`	`+ flowsToSink(mid, sink)`
`109`	`109`	`)`
`110`	`110`	`)`
`111`	`111`	`}`
`@@ -193,14 +193,14 @@ predicate flows(`
`193`	`193`	`Class sinkClass`
`194`	`194`	`) {`
`195`	`195`	`isSource(source, msg, sourceClass) and`
`196`		`- flowsToSink(source, sink, sinkClass) and`
	`196`	`+ flowsToSink(source, sink) and`
`197`	`197`	`isSink(sink, call, sinkClass)`
`198`	`198`	`}`
`199`	`199`
`200`		`-query predicate edges(Instruction a, Instruction b) { successor(a, b) and flowsToSink(b, _, _) }`
	`200`	`+query predicate edges(Instruction a, Instruction b) { successor(a, b) and flowsToSink(b, _) }`
`201`	`201`
`202`	`202`	`query predicate nodes(Instruction n, string key, string val) {`
`203`		`- flowsToSink(n, _, _) and`
	`203`	`+ flowsToSink(n, _) and`
`204`	`204`	`key = "semmle.label" and`
`205`	`205`	`val = n.toString()`
`206`	`206`	`}`