-bugfix fix implementation of unclosed block tag in double quoted str…

…ing of 12.10.2017 #396 #397 #391 #392
smarty-php · Oct 18, 2017 · e4f41ad · e4f41ad
1 parent 6b97d5c
commit e4f41ad
Show file tree

Hide file tree

Showing 6 changed files with 512 additions and 516 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -1,4 +1,9 @@
 ===== 3.1.32 - dev ===
+18.10.2017
+  -bugfix fix implementation of unclosed block tag in double quoted string of 12.10.2017
+    https://github.com/smarty-php/smarty/issues/396 https://github.com/smarty-php/smarty/issues/397
+    https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392
+
 12.10.2017
   - bugfix $smarty.block.child and $smarty.block.parent could not be used like any
     $smarty special variable https://github.com/smarty-php/smarty/issues/393

diff --git a/lexer/smarty_internal_templatelexer.plex b/lexer/smarty_internal_templatelexer.plex
@@ -694,7 +694,6 @@ class Smarty_Internal_Templatelexer
      double_quote {
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypopstate();
-        $this->compiler->leaveDoubleQuote();
      }
      backtick dollar {
         $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;

diff --git a/lexer/smarty_internal_templateparser.y b/lexer/smarty_internal_templateparser.y
@@ -1250,6 +1250,7 @@ doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
 }
 
 doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
+    $this->compiler->leaveDoubleQuote();
     res = s->to_smarty_php($this);
 }
 

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.32-dev-25';
+    const SMARTY_VERSION = '3.1.32-dev-26';
 
     /**
      * define variable scopes

diff --git a/libs/sysplugins/smarty_internal_templatelexer.php b/libs/sysplugins/smarty_internal_templatelexer.php
@@ -1066,7 +1066,6 @@ function yy_r5_7()
     {
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypopstate();
-        $this->compiler->leaveDoubleQuote();
     }
 
     function yy_r5_8()
-Original file line number
+Diff line change
@@ Expand Up / @@ -1250,6 +1250,7 @@ doublequoted_with_quotes(res) ::= QUOTE QUOTE. { @@
     }
     doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
+        $this->compiler->leaveDoubleQuote();
         res = s->to_smarty_php($this);
     }
@@ Expand Down @@