- bugfix large template text of some charsets could cause parsing errors (topic 24630)

change_log.txt

@@ -1,4 +1,7 @@
  ===== 3.1.19-dev ===== (xx.xx.2014)
+ 17.06.2014
+ - bugfix large template text of some charsets could cause parsing errors (topic 24630)
+ 
  08.06.2014
  - bugfix registered objects did not work after spelling fixes of 06.06.2014
  - bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)

libs/sysplugins/smarty_internal_config_file_compiler.php

@@ -86,6 +86,15 @@ class Smarty_Internal_Config_File_Compiler
         // init the lexer/parser to compile the config file
         $lex = new Smarty_Internal_Configfilelexer($_content, $this);
         $parser = new Smarty_Internal_Configfileparser($lex, $this);
+
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+
+
         if ($this->smarty->_parserdebug) {
             $parser->PrintTrace();
         }
@@ -98,6 +107,11 @@ class Smarty_Internal_Config_File_Compiler
         }
         // finish parsing process
         $parser->doParse(0, 0);
+
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+
         $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
     }
 

libs/sysplugins/smarty_internal_configfilelexer.php

@@ -1,12 +1,13 @@
 <?php
 /**
  * Smarty Internal Plugin Configfilelexer
-*
  * This is the lexer to break the config file source into tokens
+ *
  * @package    Smarty
  * @subpackage Config
  * @author     Uwe Tews
  */
+
 /**
  * Smarty Internal Plugin Configfilelexer
  */
@@ -26,7 +27,6 @@ class Smarty_Internal_Configfilelexer
     public $smarty_token_names = array( // Text for parser error messages
     );
 
-    				
     function __construct($data, $compiler)
     {
         // set instance object
@@ -36,23 +36,23 @@ class Smarty_Internal_Configfilelexer
         $this->line = 1;
         $this->compiler = $compiler;
         $this->smarty = $compiler->smarty;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
     }
+
     public static function &instance($new_instance = null)
     {
         static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
+        if (isset($new_instance) && is_object($new_instance)) {
             $instance = $new_instance;
+        }
         return $instance;
     }
+
     public function PrintTrace()
     {
         $this->yyTraceFILE = fopen('php://output', 'w');
         $this->yyTracePrompt = '<br>';
     }
 
-
-
     private $_yy_state = 1;
     private $_yy_stack = array();
 
@@ -82,7 +82,6 @@ class Smarty_Internal_Configfilelexer
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
-
     }
 
     public function yybegin($state)
@@ -93,9 +92,6 @@ class Smarty_Internal_Configfilelexer
         }
     }
 
-
-
-
     public function yylex1()
     {
         $tokenMap = array(
@@ -108,13 +104,13 @@ class Smarty_Internal_Configfilelexer
             7 => 0,
             8 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -134,7 +130,7 @@ class Smarty_Internal_Configfilelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -143,70 +139,75 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
                                     ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const START = 1;
+
     function yy_r1_1($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
         $this->yypushstate(self::COMMENT);
     }
+
     function yy_r1_2($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
         $this->yypushstate(self::SECTION);
     }
+
     function yy_r1_3($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
     }
+
     function yy_r1_4($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
         $this->yypushstate(self::VALUE);
     }
+
     function yy_r1_5($yy_subpatterns)
     {
 
         return false;
     }
+
     function yy_r1_6($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
     }
+
     function yy_r1_7($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_ID;
     }
+
     function yy_r1_8($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
     }
 
-
-
     public function yylex2()
     {
         $tokenMap = array(
@@ -220,13 +221,13 @@ class Smarty_Internal_Configfilelexer
             8 => 0,
             9 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -246,7 +247,7 @@ class Smarty_Internal_Configfilelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -255,59 +256,65 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
                                     ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const VALUE = 2;
+
     function yy_r2_1($yy_subpatterns)
     {
 
         return false;
     }
+
     function yy_r2_2($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
         $this->yypopstate();
     }
+
     function yy_r2_3($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_INT;
         $this->yypopstate();
     }
+
     function yy_r2_4($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
         $this->yypushstate(self::TRIPPLE);
     }
+
     function yy_r2_5($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
         $this->yypopstate();
     }
+
     function yy_r2_6($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
         $this->yypopstate();
     }
+
     function yy_r2_7($yy_subpatterns)
     {
 
@@ -320,12 +327,14 @@ class Smarty_Internal_Configfilelexer
             $this->yypopstate();
         }
     }
+
     function yy_r2_8($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
         $this->yypopstate();
     }
+
     function yy_r2_9($yy_subpatterns)
     {
 
@@ -334,20 +343,18 @@ class Smarty_Internal_Configfilelexer
         $this->yypopstate();
     }
 
-
-
     public function yylex3()
     {
         $tokenMap = array(
             1 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -367,7 +374,7 @@ class Smarty_Internal_Configfilelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -376,24 +383,24 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
                                     ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const NAKED_STRING_VALUE = 3;
+
     function yy_r3_1($yy_subpatterns)
     {
 
@@ -401,8 +408,6 @@ class Smarty_Internal_Configfilelexer
         $this->yypopstate();
     }
 
-
-
     public function yylex4()
     {
         $tokenMap = array(
@@ -410,13 +415,13 @@ class Smarty_Internal_Configfilelexer
             2 => 0,
             3 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -436,7 +441,7 @@ class Smarty_Internal_Configfilelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -445,34 +450,36 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
                                     ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const COMMENT = 4;
+
     function yy_r4_1($yy_subpatterns)
     {
 
         return false;
     }
+
     function yy_r4_2($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
     }
+
     function yy_r4_3($yy_subpatterns)
     {
 
@@ -480,21 +487,19 @@ class Smarty_Internal_Configfilelexer
         $this->yypopstate();
     }
 
-
-
     public function yylex5()
     {
         $tokenMap = array(
             1 => 0,
             2 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -514,7 +519,7 @@ class Smarty_Internal_Configfilelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -523,29 +528,30 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
                                     ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const SECTION = 5;
+
     function yy_r5_1($yy_subpatterns)
     {
 
         $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
     }
+
     function yy_r5_2($yy_subpatterns)
     {
 
@@ -553,20 +559,19 @@ class Smarty_Internal_Configfilelexer
         $this->yypopstate();
     }
 
-
     public function yylex6()
     {
         $tokenMap = array(
             1 => 0,
             2 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -586,7 +591,7 @@ class Smarty_Internal_Configfilelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -595,24 +600,24 @@ class Smarty_Internal_Configfilelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
                     continue;
-                }            } else {
+                }
+            } else {
                 throw new Exception('Unexpected input at line' . $this->line .
                                     ': ' . $this->data[$this->counter]);
             }
             break;
         } while (true);
-
     } // end function
 
-
     const TRIPPLE = 6;
+
     function yy_r6_1($yy_subpatterns)
     {
 
@@ -620,28 +625,19 @@ class Smarty_Internal_Configfilelexer
         $this->yypopstate();
         $this->yypushstate(self::START);
     }
+
     function yy_r6_2($yy_subpatterns)
     {
 
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
         $to = strlen($this->data);
-  }
         preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         } else {
             $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
         }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-  }
         $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
     }
-
-
 }
 

libs/sysplugins/smarty_internal_configfileparser.php

@@ -1,9 +1,10 @@
 <?php
+
 /**
  * Smarty Internal Plugin Configfileparser
-*
  * This is the config file parser.
  * It is generated from the internal.configfileparser.y file
+ *
  * @package    Smarty
  * @subpackage Compiler
  * @author     Uwe Tews
@@ -80,8 +81,9 @@ class TPC_yyStackEntry
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
-};
+}
 
+;
 
 #line 12 "smarty_internal_configfileparser.y"
 class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparser.php"
@@ -94,22 +96,26 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
     private $lex;
     private $internalError = false;
 
-    function __construct($lex, $compiler) {
+    function __construct($lex, $compiler)
+    {
         // set instance object
         self::instance($this);
         $this->lex = $lex;
         $this->smarty = $compiler->smarty;
         $this->compiler = $compiler;
     }
+
     public static function &instance($new_instance = null)
     {
         static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
+        if (isset($new_instance) && is_object($new_instance)) {
             $instance = $new_instance;
+        }
         return $instance;
     }
 
-    private function parse_bool($str) {
+    private function parse_bool($str)
+    {
         if (in_array(strtolower($str), array('on', 'yes', 'true'))) {
             $res = true;
         } else {
@@ -120,7 +126,9 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
 
     private static $escapes_single = Array('\\' => '\\',
                                            '\'' => '\'');
-    private static function parse_single_quoted_string($qstr) {
+
+    private static function parse_single_quoted_string($qstr)
+    {
         $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
 
         $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
@@ -139,16 +147,19 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
         return $str;
     }
 
-    private static function parse_double_quoted_string($qstr) {
+    private static function parse_double_quoted_string($qstr)
+    {
         $inner_str = substr($qstr, 1, strlen($qstr) - 2);
         return stripcslashes($inner_str);
     }
 
-    private static function parse_tripple_double_quoted_string($qstr) {
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
         return stripcslashes($qstr);
     }
 
-    private function set_var(Array $var, Array &$target_array) {
+    private function set_var(Array $var, Array &$target_array)
+    {
         $key = $var["key"];
         $value = $var["value"];
 
@@ -160,7 +171,8 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
         }
     }
 
-    private function add_global_vars(Array $vars) {
+    private function add_global_vars(Array $vars)
+    {
         if (!isset($this->compiler->config_data['vars'])) {
             $this->compiler->config_data['vars'] = Array();
         }
@@ -169,7 +181,8 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
         }
     }
 
-    private function add_section_vars($section_name, Array $vars) {
+    private function add_section_vars($section_name, Array $vars)
+    {
         if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
             $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
         }
@@ -177,6 +190,7 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
             $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
         }
     }
+
     #line 174 "smarty_internal_configfileparser.php"
 
     const TPC_OPENB = 1;
@@ -203,72 +217,124 @@ class Smarty_Internal_Configfileparser#line 80 "smarty_internal_configfileparser
 
     const YY_SZ_ACTTAB = 38;
     static public $yy_action = array(
- /*     0 */    29,   30,   34,   33,   24,   13,   19,   25,   35,   21,
+        /*     0 */
- /*    10 */    59,    8,    3,    1,   20,   12,   14,   31,   20,   12,
+        29, 30, 34, 33, 24, 13, 19, 25, 35, 21,
- /*    20 */    15,   17,   23,   18,   27,   26,    4,    5,    6,   32,
+        /*    10 */
- /*    30 */     2,   11,   28,   22,   16,    9,    7,   10,
+        59, 8, 3, 1, 20, 12, 14, 31, 20, 12,
+        /*    20 */
+        15, 17, 23, 18, 27, 26, 4, 5, 6, 32,
+        /*    30 */
+        2, 11, 28, 22, 16, 9, 7, 10,
     );
     static public $yy_lookahead = array(
- /*     0 */     7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
+        /*     0 */
- /*    10 */    20,   21,   23,   23,   17,   18,   13,   14,   17,   18,
+        7, 8, 9, 10, 11, 12, 5, 27, 15, 16,
- /*    20 */    15,    2,   17,    4,   25,   26,    6,    3,    3,   14,
+        /*    10 */
- /*    30 */    23,    1,   24,   17,    2,   25,   22,   25,
+        20, 21, 23, 23, 17, 18, 13, 14, 17, 18,
+        /*    20 */
+        15, 2, 17, 4, 25, 26, 6, 3, 3, 14,
+        /*    30 */
+        23, 1, 24, 17, 2, 25, 22, 25,
     );
     const YY_SHIFT_USE_DFLT = - 8;
     const YY_SHIFT_MAX = 19;
     static public $yy_shift_ofst = array(
- /*     0 */    -8,    1,    1,    1,   -7,   -3,   -3,   30,   -8,   -8,
+        /*     0 */
- /*    10 */    -8,   19,    5,    3,   15,   16,   24,   25,   32,   20,
+        - 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8,
+        /*    10 */
+        - 8, 19, 5, 3, 15, 16, 24, 25, 32, 20,
     );
     const YY_REDUCE_USE_DFLT = - 21;
     const YY_REDUCE_MAX = 10;
     static public $yy_reduce_ofst = array(
- /*     0 */   -10,   -1,   -1,   -1,  -20,   10,   12,    8,   14,    7,
+        /*     0 */
- /*    10 */   -11,
+        - 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7,
+        /*    10 */
+        - 11,
     );
     static public $yyExpectedTokens = array(
-        /* 0 */ array(),
+        /* 0 */
-        /* 1 */ array(5, 17, 18, ),
+        array(),
-        /* 2 */ array(5, 17, 18, ),
+        /* 1 */
-        /* 3 */ array(5, 17, 18, ),
+        array(5, 17, 18,),
-        /* 4 */ array(7, 8, 9, 10, 11, 12, 15, 16, ),
+        /* 2 */
-        /* 5 */ array(17, 18, ),
+        array(5, 17, 18,),
-        /* 6 */ array(17, 18, ),
+        /* 3 */
-        /* 7 */ array(1, ),
+        array(5, 17, 18,),
-        /* 8 */ array(),
+        /* 4 */
-        /* 9 */ array(),
+        array(7, 8, 9, 10, 11, 12, 15, 16,),
-        /* 10 */ array(),
+        /* 5 */
-        /* 11 */ array(2, 4, ),
+        array(17, 18,),
-        /* 12 */ array(15, 17, ),
+        /* 6 */
-        /* 13 */ array(13, 14, ),
+        array(17, 18,),
-        /* 14 */ array(14, ),
+        /* 7 */
-        /* 15 */ array(17, ),
+        array(1,),
-        /* 16 */ array(3, ),
+        /* 8 */
-        /* 17 */ array(3, ),
+        array(),
-        /* 18 */ array(2, ),
+        /* 9 */
-        /* 19 */ array(6, ),
+        array(),
-        /* 20 */ array(),
+        /* 10 */
-        /* 21 */ array(),
+        array(),
-        /* 22 */ array(),
+        /* 11 */
-        /* 23 */ array(),
+        array(2, 4,),
-        /* 24 */ array(),
+        /* 12 */
-        /* 25 */ array(),
+        array(15, 17,),
-        /* 26 */ array(),
+        /* 13 */
-        /* 27 */ array(),
+        array(13, 14,),
-        /* 28 */ array(),
+        /* 14 */
-        /* 29 */ array(),
+        array(14,),
-        /* 30 */ array(),
+        /* 15 */
-        /* 31 */ array(),
+        array(17,),
-        /* 32 */ array(),
+        /* 16 */
-        /* 33 */ array(),
+        array(3,),
-        /* 34 */ array(),
+        /* 17 */
-        /* 35 */ array(),
+        array(3,),
+        /* 18 */
+        array(2,),
+        /* 19 */
+        array(6,),
+        /* 20 */
+        array(),
+        /* 21 */
+        array(),
+        /* 22 */
+        array(),
+        /* 23 */
+        array(),
+        /* 24 */
+        array(),
+        /* 25 */
+        array(),
+        /* 26 */
+        array(),
+        /* 27 */
+        array(),
+        /* 28 */
+        array(),
+        /* 29 */
+        array(),
+        /* 30 */
+        array(),
+        /* 31 */
+        array(),
+        /* 32 */
+        array(),
+        /* 33 */
+        array(),
+        /* 34 */
+        array(),
+        /* 35 */
+        array(),
     );
     static public $yy_default = array(
- /*     0 */    44,   37,   41,   40,   58,   58,   58,   36,   39,   44,
+        /*     0 */
- /*    10 */    44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+        44, 37, 41, 40, 58, 58, 58, 36, 39, 44,
- /*    20 */    55,   54,   57,   56,   50,   45,   43,   42,   38,   46,
+        /*    10 */
- /*    30 */    47,   52,   51,   49,   48,   53,
+        44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+        /*    20 */
+        55, 54, 57, 56, 50, 45, 43, 42, 38, 46,
+        /*    30 */
+        47, 52, 51, 49, 48, 53,
     );
     const YYNOCODE = 29;
     const YYSTACKDEPTH = 100;
@@ -277,8 +343,8 @@ static public $yy_action = array(
     const YYERRORSYMBOL = 19;
     const YYERRSYMDT = 'yy0';
     const YYFALLBACK = 0;
-    public static $yyFallback = array(
+    public static $yyFallback = array();
-    );
+
     public function Trace($TraceFILE, $zTracePrompt)
     {
         if (!$TraceFILE) {
@@ -313,28 +379,50 @@ static public $yy_action = array(
     );
 
     public static $yyRuleName = array(
- /*   0 */ "start ::= global_vars sections",
+        /*   0 */
- /*   1 */ "global_vars ::= var_list",
+        "start ::= global_vars sections",
- /*   2 */ "sections ::= sections section",
+        /*   1 */
- /*   3 */ "sections ::=",
+        "global_vars ::= var_list",
- /*   4 */ "section ::= OPENB SECTION CLOSEB newline var_list",
+        /*   2 */
- /*   5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list",
+        "sections ::= sections section",
- /*   6 */ "var_list ::= var_list newline",
+        /*   3 */
- /*   7 */ "var_list ::= var_list var",
+        "sections ::=",
- /*   8 */ "var_list ::=",
+        /*   4 */
- /*   9 */ "var ::= ID EQUAL value",
+        "section ::= OPENB SECTION CLOSEB newline var_list",
- /*  10 */ "value ::= FLOAT",
+        /*   5 */
- /*  11 */ "value ::= INT",
+        "section ::= OPENB DOT SECTION CLOSEB newline var_list",
- /*  12 */ "value ::= BOOL",
+        /*   6 */
- /*  13 */ "value ::= SINGLE_QUOTED_STRING",
+        "var_list ::= var_list newline",
- /*  14 */ "value ::= DOUBLE_QUOTED_STRING",
+        /*   7 */
- /*  15 */ "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
+        "var_list ::= var_list var",
- /*  16 */ "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
+        /*   8 */
- /*  17 */ "value ::= NAKED_STRING",
+        "var_list ::=",
- /*  18 */ "value ::= OTHER",
+        /*   9 */
- /*  19 */ "newline ::= NEWLINE",
+        "var ::= ID EQUAL value",
- /*  20 */ "newline ::= COMMENTSTART NEWLINE",
+        /*  10 */
- /*  21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
+        "value ::= FLOAT",
+        /*  11 */
+        "value ::= INT",
+        /*  12 */
+        "value ::= BOOL",
+        /*  13 */
+        "value ::= SINGLE_QUOTED_STRING",
+        /*  14 */
+        "value ::= DOUBLE_QUOTED_STRING",
+        /*  15 */
+        "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
+        /*  16 */
+        "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
+        /*  17 */
+        "value ::= NAKED_STRING",
+        /*  18 */
+        "value ::= OTHER",
+        /*  19 */
+        "newline ::= NEWLINE",
+        /*  20 */
+        "newline ::= COMMENTSTART NEWLINE",
+        /*  21 */
+        "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
     );
 
     public function tokenName($tokenType)
@@ -352,7 +440,8 @@ static public $yy_action = array(
     public static function yy_destructor($yymajor, $yypminor)
     {
         switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
+            default:
+                break; /* If no destructor action specified: do nothing */
         }
     }
 
@@ -484,7 +573,8 @@ static public $yy_action = array(
                         $this->yystack[$this->yyidx]->stateno,
                         self::$yyRuleInfo[$yyruleno]['lhs']);
                     if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                        in_array($token, self::$yyExpectedTokens[$nextstate], true)
+                    ) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
 
@@ -545,9 +635,11 @@ static public $yy_action = array(
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
+            self::$yy_lookahead[$i] != $iLookAhead
+        ) {
             if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                && ($iFallback = self::$yyFallback[$iLookAhead]) != 0
+            ) {
                 if ($this->yyTraceFILE) {
                     fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
                         $this->yyTokenName[$iLookAhead] . " => " .
@@ -579,7 +671,8 @@ static public $yy_action = array(
         }
         $i += $iLookAhead;
         if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
+            self::$yy_lookahead[$i] != $iLookAhead
+        ) {
             return self::$yy_default[$stateno];
         } else {
             return self::$yy_action[$i];
@@ -671,24 +764,30 @@ static public $yy_action = array(
         17 => 17,
         18 => 17,
     );
+
     #line 131 "smarty_internal_configfileparser.y"
-    function yy_r0(){
+    function yy_r0()
+    {
         $this->_retvalue = null;
     }
     #line 675 "smarty_internal_configfileparser.php"
     #line 136 "smarty_internal_configfileparser.y"
-    function yy_r1(){
+    function yy_r1()
-    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;
+    {
+        $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
+        $this->_retvalue = null;
     }
     #line 680 "smarty_internal_configfileparser.php"
     #line 149 "smarty_internal_configfileparser.y"
-    function yy_r4(){
+    function yy_r4()
+    {
         $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = null;
     }
     #line 686 "smarty_internal_configfileparser.php"
     #line 154 "smarty_internal_configfileparser.y"
-    function yy_r5(){
+    function yy_r5()
+    {
         if ($this->smarty->config_read_hidden) {
             $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
         }
@@ -696,64 +795,77 @@ static public $yy_action = array(
     }
     #line 694 "smarty_internal_configfileparser.php"
     #line 162 "smarty_internal_configfileparser.y"
-    function yy_r6(){
+    function yy_r6()
+    {
         $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
     #line 699 "smarty_internal_configfileparser.php"
     #line 166 "smarty_internal_configfileparser.y"
-    function yy_r7(){
+    function yy_r7()
+    {
         $this->_retvalue = array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
     }
     #line 704 "smarty_internal_configfileparser.php"
     #line 170 "smarty_internal_configfileparser.y"
-    function yy_r8(){
+    function yy_r8()
+    {
         $this->_retvalue = Array();
     }
     #line 709 "smarty_internal_configfileparser.php"
     #line 176 "smarty_internal_configfileparser.y"
-    function yy_r9(){
+    function yy_r9()
+    {
         $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + - 2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
     }
     #line 714 "smarty_internal_configfileparser.php"
     #line 181 "smarty_internal_configfileparser.y"
-    function yy_r10(){
+    function yy_r10()
+    {
         $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
     }
     #line 719 "smarty_internal_configfileparser.php"
     #line 185 "smarty_internal_configfileparser.y"
-    function yy_r11(){
+    function yy_r11()
+    {
         $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
     }
     #line 724 "smarty_internal_configfileparser.php"
     #line 189 "smarty_internal_configfileparser.y"
-    function yy_r12(){
+    function yy_r12()
+    {
         $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
     }
     #line 729 "smarty_internal_configfileparser.php"
     #line 193 "smarty_internal_configfileparser.y"
-    function yy_r13(){
+    function yy_r13()
+    {
         $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
     #line 734 "smarty_internal_configfileparser.php"
     #line 197 "smarty_internal_configfileparser.y"
-    function yy_r14(){
+    function yy_r14()
+    {
         $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
     #line 739 "smarty_internal_configfileparser.php"
     #line 201 "smarty_internal_configfileparser.y"
-    function yy_r15(){
+    function yy_r15()
+    {
         $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor);
     }
     #line 744 "smarty_internal_configfileparser.php"
     #line 205 "smarty_internal_configfileparser.y"
-    function yy_r16(){
+    function yy_r16()
+    {
         $this->_retvalue = '';
     }
     #line 749 "smarty_internal_configfileparser.php"
     #line 209 "smarty_internal_configfileparser.y"
-    function yy_r17(){
+    function yy_r17()
+    {
         $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
+
     #line 754 "smarty_internal_configfileparser.php"
 
     private $_retvalue;
@@ -762,7 +874,8 @@ static public $yy_action = array(
     {
         $yymsp = $this->yystack[$this->yyidx];
         if ($this->yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
+            && $yyruleno < count(self::$yyRuleName)
+        ) {
             fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
                     $this->yyTracePrompt, $yyruleno,
                     self::$yyRuleName[$yyruleno]);
@@ -803,7 +916,8 @@ static public $yy_action = array(
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        } while ($this->yyidx >= 0) {
+        }
+        while ($this->yyidx >= 0) {
             $this->yy_pop_parser_stack();
         }
     }
@@ -822,7 +936,8 @@ static public $yy_action = array(
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        } while ($this->yyidx >= 0) {
+        }
+        while ($this->yyidx >= 0) {
             $stack = $this->yy_pop_parser_stack();
         }
         #line 110 "smarty_internal_configfileparser.y"
@@ -857,7 +972,8 @@ static public $yy_action = array(
         do {
             $yyact = $this->yy_find_shift_action($yymajor);
             if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
+                !$this->yy_is_expected_token($yymajor)
+            ) {
                 // force a syntax error
                 $yyact = self::YY_ERROR_ACTION;
             }

libs/sysplugins/smarty_internal_smartytemplatecompiler.php

@@ -98,6 +98,13 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
             // start state on child templates
             $this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
         }
+        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+
         if ($this->smarty->_parserdebug) {
             $this->parser->PrintTrace();
             $this->lex->PrintTrace();
@@ -117,6 +124,9 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
         }
         // finish parsing process
         $this->parser->doParse(0, 0);
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
         // check for unclosed tags
         if (count($this->_tag_stack) > 0) {
             // get stacked info

libs/sysplugins/smarty_internal_templatelexer.php

@@ -91,7 +91,6 @@ class Smarty_Internal_Templatelexer
         $this->rdel_length = strlen($this->smarty->right_delimiter);
         $this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
         $this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
     }
 
     public function PrintTrace()
@@ -160,13 +159,13 @@ class Smarty_Internal_Templatelexer
             18 => 0,
             19 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -186,7 +185,7 @@ class Smarty_Internal_Templatelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -195,9 +194,9 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
@@ -368,20 +367,12 @@ class Smarty_Internal_Templatelexer
     function yy_r1_19($yy_subpatterns)
     {
 
-        if ($this->mbstring_overload) {
-            $to = mb_strlen($this->data, 'latin1');
-        } else {
         $to = strlen($this->data);
-        }
         preg_match("/{$this->ldel}|<\?|\?>|<%|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         }
-        if ($this->mbstring_overload) {
-            $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
-        } else {
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        }
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
@@ -455,13 +446,13 @@ class Smarty_Internal_Templatelexer
             75 => 0,
             76 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -481,7 +472,7 @@ class Smarty_Internal_Templatelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -490,9 +481,9 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
@@ -956,13 +947,13 @@ class Smarty_Internal_Templatelexer
             6 => 0,
             7 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -982,7 +973,7 @@ class Smarty_Internal_Templatelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -991,9 +982,9 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
@@ -1063,22 +1054,14 @@ class Smarty_Internal_Templatelexer
     function yy_r3_7($yy_subpatterns)
     {
 
-        if ($this->mbstring_overload) {
-            $to = mb_strlen($this->data, 'latin1');
-        } else {
         $to = strlen($this->data);
-        }
         preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         } else {
             $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
         }
-        if ($this->mbstring_overload) {
-            $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
-        } else {
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        }
         $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
 
@@ -1097,13 +1080,13 @@ class Smarty_Internal_Templatelexer
             11 => 3,
             15 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -1123,7 +1106,7 @@ class Smarty_Internal_Templatelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -1132,9 +1115,9 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
@@ -1247,16 +1230,8 @@ class Smarty_Internal_Templatelexer
     function yy_r4_15($yy_subpatterns)
     {
 
-        if ($this->mbstring_overload) {
-            $to = mb_strlen($this->data, 'latin1');
-        } else {
         $to = strlen($this->data);
-        }
-        if ($this->mbstring_overload) {
-            $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
-        } else {
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        }
         $this->token = Smarty_Internal_Templateparser::TP_TEXT;
     }
 
@@ -1268,13 +1243,13 @@ class Smarty_Internal_Templatelexer
             3 => 0,
             4 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -1294,7 +1269,7 @@ class Smarty_Internal_Templatelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -1303,9 +1278,9 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
@@ -1355,20 +1330,12 @@ class Smarty_Internal_Templatelexer
     function yy_r5_4($yy_subpatterns)
     {
 
-        if ($this->mbstring_overload) {
-            $to = mb_strlen($this->data, 'latin1');
-        } else {
         $to = strlen($this->data);
-        }
         preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         }
-        if ($this->mbstring_overload) {
-            $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
-        } else {
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        }
         return false;
     }
 
@@ -1381,13 +1348,13 @@ class Smarty_Internal_Templatelexer
             4 => 1,
             6 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -1407,7 +1374,7 @@ class Smarty_Internal_Templatelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -1416,9 +1383,9 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
@@ -1481,20 +1448,12 @@ class Smarty_Internal_Templatelexer
     function yy_r6_6($yy_subpatterns)
     {
 
-        if ($this->mbstring_overload) {
-            $to = mb_strlen($this->data, 'latin1');
-        } else {
         $to = strlen($this->data);
-        }
         preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         }
-        if ($this->mbstring_overload) {
-            $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
-        } else {
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        }
         $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
     }
 
@@ -1505,13 +1464,13 @@ class Smarty_Internal_Templatelexer
             2 => 0,
             3 => 0,
         );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+        if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
         $yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
 
         do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter, 2000000000, 'latin1'), $yymatches) : preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
+            if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
                 $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
                 if (!count($yymatches)) {
@@ -1531,7 +1490,7 @@ class Smarty_Internal_Templatelexer
                 $this->value = current($yymatches); // token value
                 $r = $this->{'yy_r7_' . $this->token}($yysubmatches);
                 if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
                     // accept this token
                     return true;
@@ -1540,9 +1499,9 @@ class Smarty_Internal_Templatelexer
                     // process this token in the new state
                     return $this->yylex();
                 } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value, 'latin1') : strlen($this->value));
+                    $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data, 'latin1') : strlen($this->data))) {
+                    if ($this->counter >= strlen($this->data)) {
                         return false; // end of input
                     }
                     // skip this token
@@ -1583,22 +1542,14 @@ class Smarty_Internal_Templatelexer
     function yy_r7_3($yy_subpatterns)
     {
 
-        if ($this->mbstring_overload) {
-            $to = mb_strlen($this->data, 'latin1');
-        } else {
         $to = strlen($this->data);
-        }
         preg_match("/{$this->ldel}\/?literal\s*{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
         if (isset($match[0][1])) {
             $to = $match[0][1];
         } else {
             $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
         }
-        if ($this->mbstring_overload) {
-            $this->value = mb_substr($this->data, $this->counter, $to - $this->counter, 'latin1');
-        } else {
         $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        }
         $this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
     }
 }

libs/sysplugins/smarty_internal_templateparser.php

@@ -2662,8 +2662,7 @@ class Smarty_Internal_Templateparser #line 80 "smarty_internal_templateparser.ph
                     if (isset(self::$yyExpectedTokens[$nextstate])) {
                         $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
                         if (in_array($token,
-                                     self::$yyExpectedTokens[$nextstate], true)
+                                     self::$yyExpectedTokens[$nextstate], true)) {
-                        ) {
                             $this->yyidx = $yyidx;
                             $this->yystack = $stack;