summaryrefslogtreecommitdiff
path: root/py/vm.c
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-04-28 01:54:23 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-04-28 02:08:43 +0300
commiteff85bb1dcca0602cef055986ea3b8192dea1d71 (patch)
tree679500b7f6741516eca8e03917f3ea70ca379376 /py/vm.c
parentd54290f6e270818379e0ae8f608d62d25b7e3dea (diff)
py/vm: "yield from" didn't handle MP_OBJ_STOP_ITERATION optimization.
E.g. crashed when yielding from already stopped generators.
Diffstat (limited to 'py/vm.c')
-rw-r--r--py/vm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/py/vm.c b/py/vm.c
index b8d38f78e..bd5bae115 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1144,7 +1144,8 @@ yield:
if (ret_kind == MP_VM_RETURN_NORMAL) {
// Pop exhausted gen
sp--;
- if (ret_value == MP_OBJ_NULL) {
+ // TODO: When ret_value can be MP_OBJ_NULL here??
+ if (ret_value == MP_OBJ_NULL || ret_value == MP_OBJ_STOP_ITERATION) {
// Optimize StopIteration
// TODO: get StopIteration's value
PUSH(mp_const_none);