From eff85bb1dcca0602cef055986ea3b8192dea1d71 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 28 Apr 2016 01:54:23 +0300 Subject: py/vm: "yield from" didn't handle MP_OBJ_STOP_ITERATION optimization. E.g. crashed when yielding from already stopped generators. --- py/objgenerator.c | 1 + 1 file changed, 1 insertion(+) (limited to 'py/objgenerator.c') diff --git a/py/objgenerator.c b/py/objgenerator.c index 93df7ce13..2480b0a4b 100644 --- a/py/objgenerator.c +++ b/py/objgenerator.c @@ -99,6 +99,7 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_ assert(MP_OBJ_IS_TYPE(self_in, &mp_type_gen_instance)); mp_obj_gen_instance_t *self = MP_OBJ_TO_PTR(self_in); if (self->code_state.ip == 0) { + // Trying to resume already stopped generator *ret_val = MP_OBJ_STOP_ITERATION; return MP_VM_RETURN_NORMAL; } -- cgit v1.2.3