aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2023-09-21 04:44:37 +0200
committerMike Pall <mike>2023-09-21 04:44:37 +0200
commit234dbc481e7c218b7b1fd6777beca33dfeb7b801 (patch)
tree29f0e5668d1ad2574e83bfb0a4bd3c588b1a5d03 /src
parenta5d2f70c73e406beb617afa829a7af5b8c1d842c (diff)
parentaa6b15c1a8922848bd6f596ba384824ca3fe0f5f (diff)
downloadluajit-234dbc481e7c218b7b1fd6777beca33dfeb7b801.tar.gz
luajit-234dbc481e7c218b7b1fd6777beca33dfeb7b801.tar.bz2
luajit-234dbc481e7c218b7b1fd6777beca33dfeb7b801.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
-rw-r--r--src/lj_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_state.c b/src/lj_state.c
index 569e3f38..6efe189d 100644
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -108,7 +108,7 @@ void LJ_FASTCALL lj_state_growstack(lua_State *L, MSize need)
108 if (L->stacksize > LJ_STACK_MAXEX) 108 if (L->stacksize > LJ_STACK_MAXEX)
109 lj_err_throw(L, LUA_ERRERR); /* Does not invoke an error handler. */ 109 lj_err_throw(L, LUA_ERRERR); /* Does not invoke an error handler. */
110 /* 1. We are _at_ the limit after the last growth. */ 110 /* 1. We are _at_ the limit after the last growth. */
111 if (!L->status) { /* 2. Throw 'stack overflow'. */ 111 if (L->status < LUA_ERRRUN) { /* 2. Throw 'stack overflow'. */
112 L->status = LUA_ERRRUN; /* Prevent ending here again for pushed msg. */ 112 L->status = LUA_ERRRUN; /* Prevent ending here again for pushed msg. */
113 lj_err_msg(L, LJ_ERR_STKOV); /* May invoke an error handler. */ 113 lj_err_msg(L, LJ_ERR_STKOV); /* May invoke an error handler. */
114 } 114 }