[asterisk-commits] jpeeler: trunk r241366 - /trunk/main/pbx.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Jan 19 16:59:53 2010
New Revision: 241366

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=241366
Log:
Initialize data on the stack so that Park doesn't interpret random arguments.

passdata was only being set in pbx_substitue_variables when arguments were
passed.

(closes issue #16406)
(closes issue #16586)
Reported by: DLNoah
Patches: 
      bug16586v2.patch uploaded by jpeeler (license 325)
Tested by: DLNoah


Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=241366&r1=241365&r2=241366
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue Jan 19 16:59:53 2010
@@ -3970,8 +3970,10 @@
 	const char *tmp;
 
 	/* Nothing more to do */
-	if (!e->data)
+	if (!e->data) {
+		*passdata = '\0';
 		return;
+	}
 
 	/* No variables or expressions in e->data, so why scan it? */
 	if ((!(tmp = strchr(e->data, '$'))) || (!strstr(tmp, "${") && !strstr(tmp, "$["))) {