mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Fix VM stack overflow detection.

Browse Source
This commit is contained in:
Damien George 2014-04-10 16:59:44 +00:00
parent e90be0ddf5
commit a1ef441d18
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
py/vm.c
View File

@ -77,15 +77,11 @@ mp_vm_return_kind_t mp_execute_byte_code(const byte *code, const mp_obj_t *args,
mp_obj_t temp_state[10]; mp_obj_t temp_state[10];
mp_obj_t *state = &temp_state[0]; mp_obj_t *state = &temp_state[0];
#if DETECT_VM_STACK_OVERFLOW #if DETECT_VM_STACK_OVERFLOW
if (n_state + 1 > 10) { n_state += 1;
state = m_new(mp_obj_t, n_state + 1); #endif
}
state[n_state - n_args - n_args2] = (void*)0xdeadbeef;
#else
if (n_state > 10) { if (n_state > 10) {
state = m_new(mp_obj_t, n_state); state = m_new(mp_obj_t, n_state);
} }
#endif
mp_obj_t *sp = &state[0] - 1; mp_obj_t *sp = &state[0] - 1;
// allocate state for exceptions // allocate state for exceptions
@ -119,9 +115,22 @@ mp_vm_return_kind_t mp_execute_byte_code(const byte *code, const mp_obj_t *args,
mp_vm_return_kind_t vm_return_kind = mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp, exc_stack, &exc_sp, MP_OBJ_NULL); mp_vm_return_kind_t vm_return_kind = mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp, exc_stack, &exc_sp, MP_OBJ_NULL);
#if DETECT_VM_STACK_OVERFLOW #if DETECT_VM_STACK_OVERFLOW
if (state[n_state - n_args - n_args2] != (void*)0xdeadbeef) { // We can't check the case when an exception is returned in state[n_state - 1]
printf("VM stack overflow\n"); // and there are no arguments, because in this case our detection slot may have
assert(0); // been overwritten by the returned exception (which is allowed).
if (!(vm_return_kind == MP_VM_RETURN_EXCEPTION && n_args == 0 && n_args2 == 0)) {
// Just check to see that we have at least 1 null object left in the state.
bool overflow = true;
for (uint i = 0; i < n_state - n_args - n_args2; i++) {
if (state[i] == MP_OBJ_NULL) {
overflow = false;
break;
}
}
if (overflow) {
printf("VM stack overflow state=%p n_state+1=%u\n", state, n_state);
assert(0);
}
} }
#endif #endif
@ -182,6 +191,7 @@ outer_dispatch_loop:
dispatch_loop: dispatch_loop:
save_ip = ip; save_ip = ip;
int op = *ip++; int op = *ip++;
//printf("ip=%p sp=%p op=%u\n", save_ip, sp, op);
switch (op) { switch (op) {
case MP_BC_LOAD_CONST_FALSE: case MP_BC_LOAD_CONST_FALSE:
PUSH(mp_const_false); PUSH(mp_const_false);