From 41ee325bc96d0c828b5dfce7f0d5d27c5e28797e Mon Sep 17 00:00:00 2001 From: Taus Date: Tue, 15 Jun 2021 14:37:46 +0000 Subject: [PATCH] Python: Clean up `Stdlib.qll` Not as many opportunities to clean stuff up here. --- .../src/experimental/semmle/python/frameworks/Stdlib.qll | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/python/ql/src/experimental/semmle/python/frameworks/Stdlib.qll b/python/ql/src/experimental/semmle/python/frameworks/Stdlib.qll index 4f3457e0a99..edf610b2618 100644 --- 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) ) }