hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #599 from markshannon/python-fix-essa-nonlocal

Browse Source 
Python ESSA: Fix definition of ESSA non-local variables.
This commit is contained in:
Taus
2018-12-04 17:06:30 +01:00
committed by GitHub
parent 3b6c7d6f2e fb90d2a5a6
commit 8493518135
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
python/ql/src/semmle/python/dataflow/SsaDefinitions.qll
View File

@@ -107,11 +107,11 @@ abstract class PythonSsaSourceVariable extends SsaSourceVariable {
}
class FunctionLocalVariable extends PythonSsaSourceVariable {
FunctionLocalVariable() {
this.(LocalVariable).getScope() instanceof Function and not this.(LocalVariable).escapes()
this.(LocalVariable).getScope() instanceof Function and
not this instanceof NonLocalVariable
}
override ControlFlowNode getAnImplicitUse() {
@@ -120,8 +120,14 @@ class FunctionLocalVariable extends PythonSsaSourceVariable {
override ControlFlowNode getScopeEntryDefinition() {
not this.(LocalVariable).getId() = "*" and
not this.(LocalVariable).isParameter() and
this.(LocalVariable).getScope().getEntryNode() = result
exists(Scope s |
s.getEntryNode() = result |
s = this.(LocalVariable).getScope() and
not this.(LocalVariable).isParameter()
or
s != this.(LocalVariable).getScope() and
s = this.(LocalVariable).getALoad().getScope()
)
}
override CallNode redefinedAtCallSite() { none() }
@@ -131,7 +137,10 @@ class FunctionLocalVariable extends PythonSsaSourceVariable {
class NonLocalVariable extends PythonSsaSourceVariable {
NonLocalVariable() {
this.(LocalVariable).getScope() instanceof Function and this.(LocalVariable).escapes()
exists(Function f |
this.(LocalVariable).getScope() = f and
this.(LocalVariable).getAStore().getScope() != f
)
}
override ControlFlowNode getAnImplicitUse() {