[Asterisk-code-review] pbx lua: Support displaying lua error message if no debug t... (asterisk[master])

[Christof Lauber]

Christof Lauber has uploaded this change for review. ( https://gerrit.asterisk.org/8875


Change subject: pbx_lua:  Support displaying lua error message if no debug table exists
......................................................................

pbx_lua:  Support displaying lua error message if no debug table exists

The lua_error_function assumed that lua's debug table and traceback function
are always accessible, which is not the case. This fixes the error message
'Error in the lua error handler' triggred by switch exec() function.
If this happens lua's error message is shown without traceback.

Change-Id: Ia8d15b03188ac47211afabfa9b583ffa82411a9a
---
M pbx/pbx_lua.c
1 file changed, 2 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/75/8875/1

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 7a894b6..8673dfd 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -808,15 +808,14 @@
 	if (!lua_istable(L, -1)) {
 		/* Have no 'debug' table for whatever reason */
 		lua_pop(L, 2);
-		/*  Keep at least original err message */
-		lua_pushvalue(L, message_index);
+		/*  Original err message is on stack top now */
 		return 1;
 	}
 	lua_getfield(L, -1, "traceback");
 	if (!lua_isfunction(L, -1)) {
 		/* Same here for traceback function */
 		lua_pop(L, 3);
-		lua_pushvalue(L, message_index);
+		/*  Original err message is on stack top now */
 		return 1;
 	}
 	lua_remove(L, -2); /* remove the 'debug' table */

-- 
To view, visit https://gerrit.asterisk.org/8875
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8d15b03188ac47211afabfa9b583ffa82411a9a
Gerrit-Change-Number: 8875
Gerrit-PatchSet: 1
Gerrit-Owner: Christof Lauber <christof.lauber at annax.ch>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180430/3503f2bd/attachment.html>