retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug in handling of malformed parameter replacement. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@911 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2006-06-29 10:38:55 +00:00
parent e0657ba3a8
commit f368afc16a
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/regexroute.cpp
View File

@ -126,22 +126,6 @@ static void replaceFuncs(String &str)
}
}
// handle ${paramname} replacements
static void replaceParams(const Message &msg, String &str)
{
int p1;
while ((p1 = str.find("${")) >= 0) {
int p2 = str.find('}',p1+2);
if (p2 > 0) {
String v = str.substr(p1+2,p2-p1-2);
v.trimBlanks();
DDebug("RegexRoute",DebugAll,"Replacing parameter '%s'",
v.c_str());
str = str.substr(0,p1) + msg.getValue(v) + str.substr(p2+1);
}
}
}
// handle ;paramname[=value] assignments
static void setMessage(Message &msg, String &line)
{
@ -150,7 +134,7 @@ static void setMessage(Message &msg, String &line)
for (ObjList *p = strs; p; p=p->next()) {
String *s = static_cast<String*>(p->get());
if (s) {
replaceParams(msg,*s);
msg.replaceParams(*s);
replaceFuncs(*s);
}
if (first) {
@ -223,7 +207,7 @@ static bool oneContext(Message &msg, String &str, const String &context, String
val = val.replaceMatches(*n);
if (val.startSkip("echo") || val.startSkip("output")) {
// special case: display the line but don't set params
replaceParams(msg,val);
msg.replaceParams(val);
replaceFuncs(val);
Output("%s",val.safe());
continue;