Python: UnguardedNextInGenerator.ql: Excludes next with default value

BekaValentine · BekaValentine · commit ff6e0ce35c22 · 2020-03-16T17:08:06.000-07:00
diff --git a/python/ql/src/Exceptions/UnguardedNextInGenerator.ql b/python/ql/src/Exceptions/UnguardedNextInGenerator.ql
@@ -28,6 +28,10 @@ predicate call_to_next(CallNode call, ControlFlowNode iter) {
     iter = next().getArgumentForCall(call, 0)
 }
 
+predicate call_to_next_has_default(CallNode call) {
+    exists(call.getArg(1))
+}
+
 predicate guarded_not_empty_sequence(EssaVariable sequence) {
     sequence.getDefinition() instanceof EssaEdgeRefinement
 }
@@ -49,6 +53,7 @@ predicate stop_iteration_handled(CallNode call) {
 
 from CallNode call
 where call_to_next(call, _) and
+not call_to_next_has_default(call) and
 not exists(EssaVariable iterator |
     call_to_next(call, iterator.getAUse()) and
     iter_not_exhausted(iterator)
diff --git a/python/ql/test/query-tests/Exceptions/generators/test.py b/python/ql/test/query-tests/Exceptions/generators/test.py
@@ -47,3 +47,6 @@ def next_in_comp(seq, fields):
     seq_iter = iter(seq)
     values = [ next(seq_iter) if f.attname in NAMES else DEFAULT for f in fields ]
     return values
+
+def ok5(seq):
+    yield next(iter([]), 'foo')
