summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ldo.c3
-rw-r--r--manual/manual.of2
2 files changed, 3 insertions, 2 deletions
diff --git a/ldo.c b/ldo.c
index 66f89036..f282a773 100644
--- a/ldo.c
+++ b/ldo.c
@@ -388,9 +388,10 @@ static void rethook (lua_State *L, CallInfo *ci, int nres) {
** an error if there is no '__call' metafield.
*/
StkId luaD_tryfuncTM (lua_State *L, StkId func) {
- const TValue *tm = luaT_gettmbyobj(L, s2v(func), TM_CALL);
+ const TValue *tm;
StkId p;
checkstackGCp(L, 1, func); /* space for metamethod */
+ tm = luaT_gettmbyobj(L, s2v(func), TM_CALL); /* (after previous GC) */
if (l_unlikely(ttisnil(tm)))
luaG_callerror(L, s2v(func)); /* nothing to call */
for (p = L->top; p > func; p--) /* open space for metamethod */
diff --git a/manual/manual.of b/manual/manual.of
index 9e0b8835..c9e62b49 100644
--- a/manual/manual.of
+++ b/manual/manual.of
@@ -6247,7 +6247,7 @@ to its caller.
}
@LibEntry{error (message [, level])|
-Raises an error @see{error} with @{message} as the error object.
+Raises an error @see{error} with @id{message} as the error object.
This function never returns.
Usually, @id{error} adds some information about the error position