Merge branch 'master' into v2.1

1 files changed, 1 insertions, 2 deletions

diff --git a/src/lj_err.c b/src/lj_err.c
index d37df310..07afc580 100644
--- a/src/lj_err.c
+++ b/src/lj_err.c
@@ -500,8 +500,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
 {
   cTValue *frame = L->base-1, *bot = tvref(L->stack);
   void *cf = L->cframe;
-  while (frame > bot) {
-    lua_assert(cf != NULL);
+  while (frame > bot && cf) {
     while (cframe_nres(cframe_raw(cf)) < 0) {  /* cframe without frame? */
       if (frame >= restorestack(L, -cframe_nres(cf)))
         break;