Python points-to: Improve handling of __call__() a bit.

markshannon · markshannon · commit 3ca4524f7a75 · 2019-04-29T15:15:01.000+01:00
diff --git a/python/ql/src/semmle/python/objects/Instances.qll b/python/ql/src/semmle/python/objects/Instances.qll
@@ -59,9 +59,9 @@ class SpecificInstanceInternal extends TSpecificInstance, ObjectInternal {
     }
 
      override predicate callResult(ObjectInternal obj, CfgOrigin origin) {
-        // In general instances aren't callable, but some are...
-        // TO DO -- Handle cases where class overrides __call__
-        none()
+        // TO DO -- Handle cases where class overrides __call__ in more detail, like normal calls.
+        this.getClass().(ClassObjectInternal).lookup("__call__", _, _) and
+        obj = ObjectInternal::unknown() and origin = CfgOrigin::unknown()
     }
 
      override int intValue() {

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ class SpecificInstanceInternal extends TSpecificInstance, ObjectInternal {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`override predicate callResult(ObjectInternal obj, CfgOrigin origin) {`
`62`		`- // In general instances aren't callable, but some are...`
`63`		`- // TO DO -- Handle cases where class overrides __call__`
`64`		`- none()`
	`62`	`+ // TO DO -- Handle cases where class overrides __call__ in more detail, like normal calls.`
	`63`	`+ this.getClass().(ClassObjectInternal).lookup("__call__", _, _) and`
	`64`	`+ obj = ObjectInternal::unknown() and origin = CfgOrigin::unknown()`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`override int intValue() {`