From f354b46d296acb8a5fab89a0314a81ba72925d68 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Sun, 7 Mar 2010 18:21:14 +0100
Subject: Fix tracebacks for failed coroutines.
---
src/lj_err.c | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'src')
diff --git a/src/lj_err.c b/src/lj_err.c
index 7db37f3b..3570ebde 100644
--- a/src/lj_err.c
+++ b/src/lj_err.c
@@ -96,6 +96,8 @@ static BCPos currentpc(lua_State *L, GCfunc *fn, cTValue *nextframe)
if (!isluafunc(fn)) { /* Cannot derive a PC for non-Lua functions. */
return ~(BCPos)0;
} else if (nextframe == NULL) { /* Lua function on top. */
+ if (L->cframe == NULL)
+ return ~(BCPos)0;
ins = cframe_Lpc(L); /* Only happens during error/hook handling. */
} else {
if (frame_islua(nextframe)) {
@@ -106,6 +108,8 @@ static BCPos currentpc(lua_State *L, GCfunc *fn, cTValue *nextframe)
/* Lua function below errfunc/gc/hook: find cframe to get the PC. */
void *cf = cframe_raw(L->cframe);
TValue *f = L->base-1;
+ if (cf == NULL)
+ return ~(BCPos)0;
while (f > nextframe) {
if (frame_islua(f)) {
f = frame_prevl(f);
--
cgit v1.2.3-55-g6feb