hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 08:45:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6688 from RasmusWL/small-fix

Browse Source 
Python: Fix `globals() == locals()` FP
This commit is contained in:
Taus
2021-09-13 21:50:13 +02:00
committed by GitHub
parent 3bdc92ba8e f402475dd3
commit 4d24be04a1
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/ql/src/Statements/ModificationOfLocals.ql
View File

@@ -30,5 +30,11 @@ predicate modification_of_locals(ControlFlowNode f) {
}
from AstNode a, ControlFlowNode f
where modification_of_locals(f) and a = f.getNode()
where
modification_of_locals(f) and
a = f.getNode() and
// in module level scope `locals() == globals()`
// see https://docs.python.org/3/library/functions.html#locals
// FP report in https://github.com/github/codeql/issues/6674
not a.getScope() instanceof ModuleScope
select a, "Modification of the locals() dictionary will have no effect on the local variables."

8
python/ql/test/query-tests/Statements/general/C_StyleParentheses.expected
View File

@@ -1,4 +1,4 @@
| test.py:109:5:109:8 | cond | Parenthesized condition in 'if' statement. |
| test.py:112:8:112:11 | cond | Parenthesized condition in 'while' statement. |
| test.py:115:9:115:12 | test | Parenthesized test in 'assert' statement. |
| test.py:118:13:118:13 | x | Parenthesized value in 'return' statement. |
| test.py:115:5:115:8 | cond | Parenthesized condition in 'if' statement. |
| test.py:118:8:118:11 | cond | Parenthesized condition in 'while' statement. |
| test.py:121:9:121:12 | test | Parenthesized test in 'assert' statement. |
| test.py:124:13:124:13 | x | Parenthesized value in 'return' statement. |

2
python/ql/test/query-tests/Statements/general/ShouldUseWithStatement.expected
View File

@@ -1 +1 @@
| test.py:162:9:162:17 | Attribute() | Instance of context-manager class $@ is closed in a finally block. Consider using 'with' statement. | test.py:145:1:145:17 | class CM | CM |
| test.py:168:9:168:17 | Attribute() | Instance of context-manager class $@ is closed in a finally block. Consider using 'with' statement. | test.py:151:1:151:17 | class CM | CM |

25
python/ql/test/query-tests/Statements/general/test.py
View File

@@ -18,7 +18,7 @@ def return_in_finally(seq, x):
finally:
return 1
return 0
#Break in loop in finally
#This is OK
def return_in_loop_in_finally(f, seq):
@@ -27,7 +27,7 @@ def return_in_loop_in_finally(f, seq):
finally:
for i in seq:
break
#But this is not
def return_in_loop_in_finally(f, seq):
try:
@@ -49,7 +49,7 @@ class NonIterator(object):
for x in NonIterator():
do_something(x)
#None in for loop
def dodgy_iter(x):
@@ -91,8 +91,8 @@ for z in D():
def modification_of_locals():
x = 0
locals()['x'] = 1
@@ -104,6 +104,12 @@ def modification_of_locals():
return x
globals()['foo'] = 42 # OK
# in module-level scope `locals() == globals()`
# FP report from https://github.com/github/codeql/issues/6674
locals()['foo'] = 43 # technically OK
#C-style things
if (cond):
@@ -128,7 +134,7 @@ class classproperty(object):
return self.getter(instance_type)
class WithClassProperty(object):
@classproperty
def x(self):
return [0]
@@ -143,13 +149,13 @@ for i in WithClassProperty.x:
#Should use context mamager
class CM(object):
def __enter__(self):
pass
def __exit__(self, ex, cls, tb):
pass
def write(self, data):
pass
@@ -168,4 +174,3 @@ def assert_ok(seq):
# False positive. ODASA-8042. Fixed in PR #2401.
class false_positive:
e = (x for x in [])