[asterisk-commits] mnicholson: trunk r341811 - in /trunk: ./ pbx/pbx_lua.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Oct 21 11:42:56 2011
New Revision: 341811

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341811
Log:
only process args that exist

ASTERISK-18395
........

Merged revisions 341809 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 341810 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_lua.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/pbx/pbx_lua.c
URL: http://svnview.digium.com/svn/asterisk/trunk/pbx/pbx_lua.c?view=diff&rev=341811&r1=341810&r2=341811
==============================================================================
--- trunk/pbx/pbx_lua.c (original)
+++ trunk/pbx/pbx_lua.c Fri Oct 21 11:42:56 2011
@@ -669,7 +669,7 @@
 	int concat = 0;
 	int i = start + 1;
 
-	if (!lua_isnil(L, start)) {
+	if (start <= nargs && !lua_isnil(L, start)) {
 		lua_pushvalue(L, start);
 		concat += 1;
 	}