- unclosed block tag in double quted string must throw compiler excep…

…tion. #391 #392
smarty-php · Oct 12, 2017 · 6b97d5c · 6b97d5c
1 parent b271173
commit 6b97d5c
Show file tree

Hide file tree

Showing 7 changed files with 641 additions and 745 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -2,6 +2,8 @@
 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
+  - unclosed block tag in double quoted string must throw compiler exception.
+     https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392
 
 07.10.2017
   - bugfix modification of 9.8.2017 did fail on some recursive

diff --git a/lexer/smarty_internal_templatelexer.plex b/lexer/smarty_internal_templatelexer.plex
@@ -510,6 +510,7 @@ class Smarty_Internal_Templatelexer
      double_quote {
         $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
         $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
      }
      singlequotestring {
         $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
@@ -693,6 +694,7 @@ 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
@@ -135,7 +135,7 @@ class Smarty_Internal_Templateparser
     public $template_prefix = array();
 
     /**
-     * security object
+     * template prefix array
      *
      * @var \Smarty_Internal_ParseTree[]
      */

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-24';
+    const SMARTY_VERSION = '3.1.32-dev-25';
 
     /**
      * define variable scopes