From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Sat, 13 Jun 2015 17:23:54 +0000 (+0200)
Subject: daemon/bindings: return top to previous after timer
X-Git-Tag: v1.0.0-beta1~118^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b51412b634e080636dcc7aed04cea5d2365d153;p=thirdparty%2Fknot-resolver.git

daemon/bindings: return top to previous after timer
---

diff --git a/daemon/bindings.c b/daemon/bindings.c
index cb20310db..9bf833890 100644
--- a/daemon/bindings.c
+++ b/daemon/bindings.c
@@ -449,6 +449,7 @@ static void event_callback(uv_timer_t *timer)
 	lua_State *L = worker->engine->L;
 
 	/* Retrieve callback and execute */
+	int top = lua_gettop(L);
 	lua_rawgeti(L, LUA_REGISTRYINDEX, (intptr_t) timer->data);
 	lua_rawgeti(L, -1, 1);
 	lua_pushinteger(L, (intptr_t) timer->data);
@@ -457,7 +458,7 @@ static void event_callback(uv_timer_t *timer)
 		fprintf(stderr, "error: %s\n", lua_tostring(L, -1));
 	}
 	/* Clear the stack, there may be event a/o enything returned */
-	lua_settop(L, 0);
+	lua_settop(L, top);
 	/* Free callback if not recurrent or an error */
 	if (ret != 0 || uv_timer_get_repeat(timer) == 0) {
 		uv_close((uv_handle_t *)timer, (uv_close_cb) event_free);