python: convenience methods for handler types

yoff · yoff · commit 7d05ba38d559 · 2022-11-10T22:20:28.000+01:00
diff --git a/python/ql/lib/semmle/python/Stmts.qll b/python/ql/lib/semmle/python/Stmts.qll
@@ -392,6 +392,12 @@ class Try extends Try_ {
   /** Gets an exception handler of this try statement. */
   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() {
     result = this.getFinalbody().getLastItem().getLastStatement()
     or
diff --git a/python/ql/src/Exceptions/UnguardedNextInGenerator.ql b/python/ql/src/Exceptions/UnguardedNextInGenerator.ql
@@ -52,7 +52,7 @@ predicate iter_not_exhausted(EssaVariable iterator) {
 predicate stop_iteration_handled(CallNode call) {
   exists(Try t |
     t.containsInScope(call.getNode()) and
-    t.getAHandler().getType() = stopIteration().getAValueReachableFromSource().asExpr()
+    t.getANormalHandler().getType() = stopIteration().getAValueReachableFromSource().asExpr()
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ predicate iter_not_exhausted(EssaVariable iterator) {`
`52`	`52`	`predicate stop_iteration_handled(CallNode call) {`
`53`	`53`	`exists(Try t \|`
`54`	`54`	`t.containsInScope(call.getNode()) and`
`55`		`- t.getAHandler().getType() = stopIteration().getAValueReachableFromSource().asExpr()`
	`55`	`+ t.getANormalHandler().getType() = stopIteration().getAValueReachableFromSource().asExpr()`
`56`	`56`	`)`
`57`	`57`	`}`
`58`	`58`