Add proper error messages for failed stack checks (#284)

tobil4sk · web-flow · commit 90939abee79b · 2024-07-02T17:12:14.000+02:00
diff --git a/vm/module.c b/vm/module.c
@@ -545,7 +545,7 @@ neko_module *neko_read_module( reader r, readp p, value loader ) {
 		memset(stmp,UNKNOWN,m->codesize+1);
 		if( !vm->trusted_code && !neko_check_stack(m,stmp,0,0,0) ) {
 			free(stmp);
-			ERROR();
+			failure("Stack check failed for global scope");
 		}
 		for(i=0;i<m->nglobals;i++) {
 			vfunction *f = (vfunction*)m->globals[i];
@@ -557,7 +557,7 @@ neko_module *neko_read_module( reader r, readp p, value loader ) {
 				}
 				if( !vm->trusted_code && !neko_check_stack(m,stmp,itmp,f->nargs,f->nargs) ) {
 					free(stmp);
-					ERROR();
+					failure("Stack check failed for function scope");
 				}
 				f->addr = m->code + itmp;
 				prev = itmp;

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ neko_module *neko_read_module( reader r, readp p, value loader ) {`
`545`	`545`	`memset(stmp,UNKNOWN,m->codesize+1);`
`546`	`546`	`if( !vm->trusted_code && !neko_check_stack(m,stmp,0,0,0) ) {`
`547`	`547`	`free(stmp);`
`548`		`- ERROR();`
	`548`	`+ failure("Stack check failed for global scope");`
`549`	`549`	`}`
`550`	`550`	`for(i=0;i<m->nglobals;i++) {`
`551`	`551`	`vfunction f = (vfunction)m->globals[i];`
`@@ -557,7 +557,7 @@ neko_module *neko_read_module( reader r, readp p, value loader ) {`
`557`	`557`	`}`
`558`	`558`	`if( !vm->trusted_code && !neko_check_stack(m,stmp,itmp,f->nargs,f->nargs) ) {`
`559`	`559`	`free(stmp);`
`560`		`- ERROR();`
	`560`	`+ failure("Stack check failed for function scope");`
`561`	`561`	`}`
`562`	`562`	`f->addr = m->code + itmp;`
`563`	`563`	`prev = itmp;`