diff options
author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-31 18:14:54 +0300 |
---|---|---|
committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-31 18:14:54 +0300 |
commit | ff8da0b835e94462e6b5da6fbe48409fdff40b28 (patch) | |
tree | 38a9d2e6bb72b06e04944317e61c6e8f3bbcf661 /py/vm.c | |
parent | ae9c82d5f39ffb69bf47622ed1e67a6d2f2f66f4 (diff) | |
download | micropython-ff8da0b835e94462e6b5da6fbe48409fdff40b28.tar.gz micropython-ff8da0b835e94462e6b5da6fbe48409fdff40b28.zip |
vm: Detect stack underflow in addition to overflow.
Diffstat (limited to 'py/vm.c')
-rw-r--r-- | py/vm.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -158,6 +158,13 @@ mp_vm_return_kind_t mp_execute_bytecode(const byte *code, const mp_obj_t *args, mp_vm_return_kind_t vm_return_kind = mp_execute_bytecode2(code, &ip, &state[n_state - 1], &sp, exc_stack, &exc_sp, MP_OBJ_NULL); #if DETECT_VM_STACK_OVERFLOW + if (vm_return_kind == MP_VM_RETURN_NORMAL) { + if (sp != state) { + printf("Stack misalign: %d\n", sp - state); + assert(0); + } + } + // We can't check the case when an exception is returned in state[n_state - 1] // and there are no arguments, because in this case our detection slot may have // been overwritten by the returned exception (which is allowed). |