mirror of
https://github.com/github/codeql.git
synced 2026-05-02 04:05:14 +02:00
Python: Teach py/unreachable-statement about contextlib.suppress.
This commit is contained in:
@@ -31,9 +31,18 @@ predicate unique_yield(Stmt s) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Holds if `contextlib.suppress` may be used in the same scope as `s` */
|
||||
predicate suppression_in_scope(Stmt s) {
|
||||
exists(With w |
|
||||
w.getContextExpr().(Call).getFunc().pointsTo(Value::named("contextlib.suppress")) and
|
||||
w.getScope() = s.getScope()
|
||||
)
|
||||
}
|
||||
|
||||
predicate reportable_unreachable(Stmt s) {
|
||||
s.isUnreachable() and
|
||||
not typing_import(s) and
|
||||
not suppression_in_scope(s) and
|
||||
not exists(Stmt other | other.isUnreachable() |
|
||||
other.contains(s)
|
||||
or
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
Statements/UnreachableCode.ql
|
||||
31
python/ql/test/3/query-tests/Statements/unreachable_suppressed/test.py
Executable file
31
python/ql/test/3/query-tests/Statements/unreachable_suppressed/test.py
Executable file
@@ -0,0 +1,31 @@
|
||||
from contextlib import suppress
|
||||
|
||||
def raises_exception():
|
||||
raise Exception("This will be suppressed")
|
||||
|
||||
def foo():
|
||||
test = False
|
||||
with suppress(Exception):
|
||||
raises_exception()
|
||||
test = True
|
||||
if test:
|
||||
return
|
||||
print("An exception was raised") # FP: not reached
|
||||
|
||||
foo()
|
||||
|
||||
def bar(x):
|
||||
test = False
|
||||
try:
|
||||
if x:
|
||||
raise Exception("Bar")
|
||||
test = True
|
||||
except Exception:
|
||||
pass
|
||||
if test:
|
||||
print("Test was set")
|
||||
return
|
||||
print("Test was not set")
|
||||
|
||||
bar(True)
|
||||
bar(False)
|
||||
Reference in New Issue
Block a user