fix(core) Fix infinite loop

issue #5882

fix(core) Fix infinite loop
issue #5882
616ab034 · Côme Chilliet · da202193 · 616ab034
Commit 616ab034 authored 6 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- a/include/class_templateHandling.inc
+++ b/include/class_templateHandling.inc
@@ -229,10 +229,12 @@ class templateHandling
      return preg_replace('/^%%/', '', $string);
    }

-    $vars         = array();
-    while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE)) {
+    $offset = 0;
+    $vars   = array();
+    while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
      $replace  = static::parseMask($m[1][0], $attrs);
      $vars[]   = array($m[0][1], strlen($m[0][0]), $replace);
+      $offset   = $m[0][1] + strlen($m[0][0]);
    }

    $generator = static::iteratePossibleValues($string, $vars, $escapeMethod);