hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

python: convenience methods for handler types

Browse Source
This commit is contained in:
Rasmus Lerchedahl Petersen
2022-11-10 14:47:02 +01:00
parent e67515fae7
commit 7d05ba38d5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/ql/lib/semmle/python/Stmts.qll
View File

@@ -392,6 +392,12 @@ class Try extends Try_ {
/** Gets an exception handler of this try statement. */ /** Gets an exception handler of this try statement. */
override Stmt getAHandler() { result = Try_.super.getAHandler() } override Stmt getAHandler() { result = Try_.super.getAHandler() }
/** Gets a normal exception handler, `except`, of this try statement. */
ExceptStmt getANormalHandler() { result = this.getAHandler() }
/** Gets a group exception handler, `except*`, of this try statement. */
ExceptGroupStmt getAGroupHandler() { result = this.getAHandler() }
override Stmt getLastStatement() { override Stmt getLastStatement() {
result = this.getFinalbody().getLastItem().getLastStatement() result = this.getFinalbody().getLastItem().getLastStatement()
or or

2
python/ql/src/Exceptions/UnguardedNextInGenerator.ql
View File

@@ -52,7 +52,7 @@ predicate iter_not_exhausted(EssaVariable iterator) {
predicate stop_iteration_handled(CallNode call) { predicate stop_iteration_handled(CallNode call) {
exists(Try t | exists(Try t |
t.containsInScope(call.getNode()) and t.containsInScope(call.getNode()) and
t.getAHandler().getType() = stopIteration().getAValueReachableFromSource().asExpr() t.getANormalHandler().getType() = stopIteration().getAValueReachableFromSource().asExpr()
) )
} }