csfilter: fix a memory leak in MsgReplace

kdudka · kdudka · commit fb654298cdca · 2016-02-16T14:12:40.000+01:00
diff --git a/csfilter.cc b/csfilter.cc
@@ -44,11 +44,11 @@ inline std::string regexReplaceWrap(
 MsgFilter* MsgFilter::self_;
 
 struct MsgReplace {
-    const boost::regex         *regex;
+    const boost::regex          regex;
     const std::string           replaceWith;
 
     MsgReplace(const std::string &regex_, const std::string &rpl) :
-        regex(new boost::regex(regex_)),
+        regex(regex_),
         replaceWith(rpl)
     {
     }
@@ -143,12 +143,12 @@ std::string MsgFilter::filterMsg(
 {
     std::string filtered = msg;
     BOOST_FOREACH(const struct MsgReplace *rpl, d->msgFilterMap[checker]) {
-        filtered = regexReplaceWrap(filtered, *rpl->regex, rpl->replaceWith);
+        filtered = regexReplaceWrap(filtered, rpl->regex, rpl->replaceWith);
     }
 
     // these substitutions are common for all checkers
     BOOST_FOREACH(const struct MsgReplace *rpl, d->msgFilterMap[""]) {
-        filtered = regexReplaceWrap(filtered, *rpl->regex, rpl->replaceWith);
+        filtered = regexReplaceWrap(filtered, rpl->regex, rpl->replaceWith);
     }
 
 #if DEBUG_SUBST > 1

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,11 @@ inline std::string regexReplaceWrap(`
`44`	`44`	`MsgFilter* MsgFilter::self_;`
`45`	`45`
`46`	`46`	`struct MsgReplace {`
`47`		`- const boost::regex *regex;`
	`47`	`+ const boost::regex regex;`
`48`	`48`	`const std::string replaceWith;`
`49`	`49`
`50`	`50`	`MsgReplace(const std::string &regex_, const std::string &rpl) :`
`51`		`- regex(new boost::regex(regex_)),`
	`51`	`+ regex(regex_),`
`52`	`52`	`replaceWith(rpl)`
`53`	`53`	`{`
`54`	`54`	`}`
`@@ -143,12 +143,12 @@ std::string MsgFilter::filterMsg(`
`143`	`143`	`{`
`144`	`144`	`std::string filtered = msg;`
`145`	`145`	`BOOST_FOREACH(const struct MsgReplace *rpl, d->msgFilterMap[checker]) {`
`146`		`- filtered = regexReplaceWrap(filtered, *rpl->regex, rpl->replaceWith);`
	`146`	`+ filtered = regexReplaceWrap(filtered, rpl->regex, rpl->replaceWith);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`// these substitutions are common for all checkers`
`150`	`150`	`BOOST_FOREACH(const struct MsgReplace *rpl, d->msgFilterMap[""]) {`
`151`		`- filtered = regexReplaceWrap(filtered, *rpl->regex, rpl->replaceWith);`
	`151`	`+ filtered = regexReplaceWrap(filtered, rpl->regex, rpl->replaceWith);`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`#if DEBUG_SUBST > 1`