TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/objgenerator: Protect against reentering a generator.

Browse Source 
Generators that are already executing cannot be reexecuted.  This patch
puts in a check for such a case.

Thanks to @jepler for finding the bug.
This commit is contained in:
Damien George
2018-05-22 16:54:03 +10:00
parent 771cb359af
commit 400273a799
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
py/objgenerator.c
View File

@@ -117,9 +117,19 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
*self->code_state.sp = send_value;
}
}
// We set self->globals=NULL while executing, for a sentinel to ensure the generator
// cannot be reentered during execution
if (self->globals == NULL) {
mp_raise_ValueError("generator already executing");
}
// Set up the correct globals context for the generator and execute it
self->code_state.old_globals = mp_globals_get();
mp_globals_set(self->globals);
self->globals = NULL;
mp_vm_return_kind_t ret_kind = mp_execute_bytecode(&self->code_state, throw_value);
self->globals = mp_globals_get();
mp_globals_set(self->code_state.old_globals);
switch (ret_kind) {