Python: CG trace: handle class instantiation properly in points-to

RasmusWL · RasmusWL · commit 367a49803bc6 · 2020-07-24T11:19:11.000+02:00
diff --git a/python/tools/recorded-call-graph-metrics/ql/RecordedCalls.qll b/python/tools/recorded-call-graph-metrics/ql/RecordedCalls.qll
@@ -248,7 +248,14 @@ module PointsToBasedCallGraph {
         xmlCallee = this.getXMLCallee() and
         (
           xmlCallee instanceof XMLPythonCallee and
-          calleeValue.(PythonFunctionValue).getScope() = xmlCallee.(XMLPythonCallee).getACallee()
+          (
+            // normal function
+            calleeValue.(PythonFunctionValue).getScope() = xmlCallee.(XMLPythonCallee).getACallee()
+            or
+            // class instantiation -- points-to says the call goes to the class
+            calleeValue.(ClassValue).lookup("__init__").(PythonFunctionValue).getScope() =
+              xmlCallee.(XMLPythonCallee).getACallee()
+          )
           or
           xmlCallee instanceof XMLExternalCallee and
           calleeValue.(BuiltinFunctionObjectInternal).getBuiltin() =
