Python: Clean up Stdlib.qll

tausbn · web-flow · commit 41ee325bc96d · 2021-06-15T15:04:30.000Z
Not as many opportunities to clean stuff up here.
diff --git a/python/ql/src/experimental/semmle/python/frameworks/Stdlib.qll b/python/ql/src/experimental/semmle/python/frameworks/Stdlib.qll
@@ -64,15 +64,14 @@ private module Re {
    *
    * See https://docs.python.org/3/library/re.html#regular-expression-objects
    */
-  private class CompiledRegex extends DataFlow::CallCfgNode, RegexExecution::Range {
+  private class CompiledRegex extends DataFlow::MethodCallNode, RegexExecution::Range {
     DataFlow::Node regexNode;
 
     CompiledRegex() {
-      exists(DataFlow::CallCfgNode patternCall, DataFlow::AttrRead reMethod |
-        this.getFunction() = reMethod and
+      exists(DataFlow::MethodCallNode patternCall |
         patternCall = API::moduleImport("re").getMember("compile").getACall() and
-        patternCall.flowsTo(reMethod.getObject()) and
-        reMethod.getAttributeName() instanceof RegexExecutionMethods and
+        patternCall.flowsTo(this.getReceiver()) and
+        this.getMethodName() instanceof RegexExecutionMethods and
         regexNode = patternCall.getArg(0)
       )
     }

Original file line number	Diff line number	Diff line change
`@@ -64,15 +64,14 @@ private module Re {`
`64`	`64`	`*`
`65`	`65`	`* See https://docs.python.org/3/library/re.html#regular-expression-objects`
`66`	`66`	`*/`
`67`		`- private class CompiledRegex extends DataFlow::CallCfgNode, RegexExecution::Range {`
	`67`	`+ private class CompiledRegex extends DataFlow::MethodCallNode, RegexExecution::Range {`
`68`	`68`	`DataFlow::Node regexNode;`
`69`	`69`
`70`	`70`	`CompiledRegex() {`
`71`		`- exists(DataFlow::CallCfgNode patternCall, DataFlow::AttrRead reMethod \|`
`72`		`- this.getFunction() = reMethod and`
	`71`	`+ exists(DataFlow::MethodCallNode patternCall \|`
`73`	`72`	`patternCall = API::moduleImport("re").getMember("compile").getACall() and`
`74`		`- patternCall.flowsTo(reMethod.getObject()) and`
`75`		`- reMethod.getAttributeName() instanceof RegexExecutionMethods and`
	`73`	`+ patternCall.flowsTo(this.getReceiver()) and`
	`74`	`+ this.getMethodName() instanceof RegexExecutionMethods and`
`76`	`75`	`regexNode = patternCall.getArg(0)`
`77`	`76`	`)`
`78`	`77`	`}`