shithub: libmujs

Info  •  Files  •  Log  •  Branches

Clean up stack on errors in js_pcall and js_pconstruct.

Exactly one value will remain on the stack after js_pcall: either
the return value or the error object.

--- a/jsrun.c

+++ b/jsrun.c

@@ -1100,8 +1100,13 @@

 int js_pconstruct(js_State *J, int n)

 {

-	if (js_try(J))

+	int savetop = TOP - n - 2;

+	if (js_try(J)) {

+		/* clean up the stack to only hold the error object */

+		STACK[savetop] = STACK[TOP-1];

+		TOP = savetop + 1;

 		return 1;

+	}

 	js_construct(J, n);

 	js_endtry(J);

 	return 0;

@@ -1109,8 +1114,13 @@

 int js_pcall(js_State *J, int n)

 {

-	if (js_try(J))

+	int savetop = TOP - n - 2;

+	if (js_try(J)) {

+		/* clean up the stack to only hold the error object */

+		STACK[savetop] = STACK[TOP-1];

+		TOP = savetop + 1;

 		return 1;

+	}

 	js_call(J, n);

 	js_endtry(J);

 	return 0;

--- a/main.c

+++ b/main.c

@@ -123,11 +123,13 @@

 {

 	if (js_ploadstring(J, "[string]", source)) {

 		fprintf(stderr, "%s\n", js_tostring(J, -1));

+		js_pop(J, 1);

 		return 1;

 	}

 	js_pushglobal(J);

 	if (js_pcall(J, 0)) {

 		fprintf(stderr, "%s\n", js_tostring(J, -1));

+		js_pop(J, 1);

 		return 1;

 	}

 	if (js_isdefined(J, -1))