Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions python/extractor/semmle/python/passes/flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -909,14 +909,22 @@ def _walk_slice(self, node, predecessors):
def _walk_break(self, node, predecessors):
#A break statement counts as an exit to the enclosing loop statement
predecessors = self.add_successor(predecessors, node)
self.scope.breaking_stack.add(predecessors)
# In well formed code, there should always be an element in the breaking stack, but because
# our parser accepts code where `break` appears outside of a loop, we must check for this
# case.
if self.scope.breaking_stack:
self.scope.breaking_stack.add(predecessors)
#Provide no predecessors to following statement
return EMPTY

def _walk_continue(self, node, predecessors):
#A continue statement counts as an exit to the following orelse
predecessors = self.add_successor(predecessors, node)
self.scope.continuing_stack.add(predecessors)
# In well formed code, there should always be an element in the continuing stack, but
# because our parser accepts code where `continue` appears outside of a loop, we must check
# for this case.
if self.scope.continuing_stack:
self.scope.continuing_stack.add(predecessors)
#Provide no predecessors to following statement
return EMPTY

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
category: fix
---

- Using the `break` and `continue` keywords outside of a loop, which is a syntax error but is accepted by our parser, would cause the control-flow construction to fail. This is now no longer the case.
10 changes: 10 additions & 0 deletions python/ql/test/extractor-tests/syntax_error/without_loop.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# The following constructs are syntax errors in Python, as they are not inside a loop.
# However, our parser does not consider this code to be syntactically incorrect.
# Thus, this test is really observing that allowing these constructs does not break any other parts
# of the extractor.

if True:
break

if True:
continue