hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed MOO_STACK_PUSH to check process stack overflow

Browse Source
This commit is contained in:
hyunghwan.chung 2019-10-16 09:50:12 +00:00
parent 3f7e4b0953
commit c2458c61cb
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moo/lib/exec.c
View File

@ -6392,7 +6392,7 @@ static int __execute (moo_t* moo)
END_DISPATCH_LOOP() END_DISPATCH_LOOP()
return 0; return (moo->abort_req <= -1)? -1: 0;
} }
int moo_execute (moo_t* moo) int moo_execute (moo_t* moo)

14
moo/lib/moo.h
View File

@ -113,7 +113,7 @@ enum moo_option_dflval_t
MOO_DFL_LOG_MAXCAPA = MOO_LOG_CAPA_ALIGN * 16, MOO_DFL_LOG_MAXCAPA = MOO_LOG_CAPA_ALIGN * 16,
MOO_DFL_SYMTAB_SIZE = 5000, MOO_DFL_SYMTAB_SIZE = 5000,
MOO_DFL_SYSDIC_SIZE = 5000, MOO_DFL_SYSDIC_SIZE = 5000,
MOO_DFL_PROCSTK_SIZE = 5000 MOO_DFL_PROCSTK_SIZE = 1000
}; };
typedef enum moo_option_dflval_t moo_option_dflval_t; typedef enum moo_option_dflval_t moo_option_dflval_t;
@ -1731,11 +1731,19 @@ struct moo_t
}; };
/* TODO: proper stack bound check when pushing */ /* TODO: proper stack bound check when pushing */
/*MOO_ASSERT (moo, (moo)->sp < (moo_ooi_t)(MOO_OBJ_GET_SIZE((moo)->processor->active) - MOO_PROCESS_NAMED_INSTVARS)); */
#define MOO_STACK_PUSH(moo,v) \ #define MOO_STACK_PUSH(moo,v) \
do { \ do { \
(moo)->sp = (moo)->sp + 1; \ (moo)->sp = (moo)->sp + 1; \
MOO_ASSERT (moo, (moo)->sp < (moo_ooi_t)(MOO_OBJ_GET_SIZE((moo)->processor->active) - MOO_PROCESS_NAMED_INSTVARS)); \ if ((moo)->sp >= (moo_ooi_t)(MOO_OBJ_GET_SIZE((moo)->processor->active) - MOO_PROCESS_NAMED_INSTVARS)) \
MOO_STORE_OOP (moo, &(moo)->processor->active->stack[(moo)->sp], v); \ { \
moo_seterrbfmt (moo, MOO_EOOMEM, "process stack overflow"); \
(moo)->abort_req = -1; \
} \
else \
{ \
MOO_STORE_OOP (moo, &(moo)->processor->active->stack[(moo)->sp], v); \
} \
} while(0) } while(0)
#define MOO_STACK_GET(moo,v_sp) ((moo)->processor->active->stack[v_sp]) #define MOO_STACK_GET(moo,v_sp) ((moo)->processor->active->stack[v_sp])