Python: Ignore dead objects from library trap files.

markshannon · markshannon · commit 32dabcee1e1d · 2019-03-05T15:27:45.000Z
diff --git a/python/ql/src/semmle/python/types/Object.qll b/python/ql/src/semmle/python/types/Object.qll
@@ -10,6 +10,13 @@ private cached predicate is_an_object(@py_object obj) {
         exists(@py_cobject mod_type | py_special_objects(mod_type, "ModuleType") and py_cobjecttypes(obj, mod_type)) and
         exists(Module m | py_cobjectnames(obj, m.getName()))
     )
+    and (
+        /* Exclude unmatched builtin objects in the library trap files */
+        obj instanceof ControlFlowNode or
+        py_cobjectnames(obj, _) or
+        py_cobjecttypes(obj, _) or
+        py_special_objects(obj, _)
+    )
 }
 
 /** Instances of this class represent objects in the Python program. However, since

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,13 @@ private cached predicate is_an_object(@py_object obj) {`
`10`	`10`	`exists(@py_cobject mod_type \| py_special_objects(mod_type, "ModuleType") and py_cobjecttypes(obj, mod_type)) and`
`11`	`11`	`exists(Module m \| py_cobjectnames(obj, m.getName()))`
`12`	`12`	`)`
	`13`	`+ and (`
	`14`	`+ /* Exclude unmatched builtin objects in the library trap files */`
	`15`	`+ obj instanceof ControlFlowNode or`
	`16`	`+ py_cobjectnames(obj, _) or`
	`17`	`+ py_cobjecttypes(obj, _) or`
	`18`	`+ py_special_objects(obj, _)`
	`19`	`+ )`
`13`	`20`	`}`
`14`	`21`
`15`	`22`	`/** Instances of this class represent objects in the Python program. However, since`