Python points-to: Fix up re extension.

markshannon · markshannon · commit 2b72a50dbfd4 · 2019-05-15T11:24:40.000+01:00
diff --git a/python/ql/src/semmle/python/types/Extensions.qll b/python/ql/src/semmle/python/types/Extensions.qll
@@ -109,10 +109,10 @@ class ReModulePointToExtension extends PointsToExtension {
     }
 
     override predicate pointsTo(Context context, ObjectInternal value, ControlFlowNode origin) {
-        value = Module::named("sre_constants").attr("SRE_FLAG_" + name) and
-        exists(ModuleObjectInternal sre_constants |
+        exists(ModuleObjectInternal sre_constants, CfgOrigin orig |
             sre_constants.getName() = "sre_constants" and
-            sre_constants.attribute(name, value, CfgOrigin::fromCfgNode(origin))
+            sre_constants.attribute("SRE_FLAG_" + name, value, orig) and
+            origin = orig.asCfgNodeOrHere(this)
         )
         and context.appliesTo(this)
     }

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,10 @@ class ReModulePointToExtension extends PointsToExtension {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`override predicate pointsTo(Context context, ObjectInternal value, ControlFlowNode origin) {`
`112`		`- value = Module::named("sre_constants").attr("SRE_FLAG_" + name) and`
`113`		`- exists(ModuleObjectInternal sre_constants \|`
	`112`	`+ exists(ModuleObjectInternal sre_constants, CfgOrigin orig \|`
`114`	`113`	`sre_constants.getName() = "sre_constants" and`
`115`		`- sre_constants.attribute(name, value, CfgOrigin::fromCfgNode(origin))`
	`114`	`+ sre_constants.attribute("SRE_FLAG_" + name, value, orig) and`
	`115`	`+ origin = orig.asCfgNodeOrHere(this)`
`116`	`116`	`)`
`117`	`117`	`and context.appliesTo(this)`
`118`	`118`	`}`