Python legacy objects: fix function/method call.

markshannon · markshannon · commit 2d4f64f2e594 · 2019-04-26T16:21:47.000+01:00
diff --git a/python/ql/src/semmle/python/types/FunctionObject.qll b/python/ql/src/semmle/python/types/FunctionObject.qll
@@ -47,14 +47,15 @@ abstract class FunctionObject extends Object {
 
     /** Gets a call-site from where this function is called as a function */
     CallNode getAFunctionCall() {
-        result.getFunction() instanceof NameNode and
-        result = this.getACall()
+        result.getFunction().inferredValue() = theCallable()
     }
 
     /** Gets a call-site from where this function is called as a method */
     CallNode getAMethodCall() {
-        result.getFunction() instanceof AttrNode and
-        result = this.getACall()
+        exists(BoundMethodObjectInternal bm |
+            result.getFunction().inferredValue() = bm and
+            bm.getFunction() = theCallable()
+        )
     }
 
     /** Gets a call-site from where this function is called */
