kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 241366 via svnmerge from

Browse Source 
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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-01-19 23:01:02 +00:00
parent dbd71d4930
commit 75b6779b19
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/pbx.c
View File

@@ -3042,8 +3042,10 @@ static void pbx_substitute_variables(char *passdata, int datalen, struct ast_cha
const char *tmp; const char *tmp;
/* Nothing more to do */ /* Nothing more to do */
if (!e->data) if (!e->data) {
*passdata = '\0';
return; return;
}
/* No variables or expressions in e->data, so why scan it? */ /* No variables or expressions in e->data, so why scan it? */
if ((!(tmp = strchr(e->data, '$'))) || (!strstr(tmp, "${") && !strstr(tmp, "$["))) { if ((!(tmp = strchr(e->data, '$'))) || (!strstr(tmp, "${") && !strstr(tmp, "$["))) {