[asterisk-commits] jpeeler: branch 1.6.1 r241368 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Jan 19 17:01:44 2010
New Revision: 241368

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=241368
Log:
Merged revisions 241366 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r241366 | jpeeler | 2010-01-19 16:59:53 -0600 (Tue, 19 Jan 2010) | 13 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/pbx.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=241368&r1=241367&r2=241368
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Tue Jan 19 17:01:44 2010
@@ -3123,8 +3123,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, "$["))) {