Latte: try to fix parsing of malformed macros [nette#711]

Majkl578 · Jul 26, 2012 · c3b5735 · c3b5735
1 parent bff18d2
commit c3b5735
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/Nette/Latte/Parser.php b/Nette/Latte/Parser.php
@@ -104,6 +104,10 @@ public function parse($input)
 			if (!$matches) { // EOF
 				break;
 
+			} else if (!empty($matches['malformed'])) {
+				file_put_contents('/tmp/lattetest', $matches[0]);
+				throw new CompileException("Malformed macro declaration {{$matches['macro']}}.");
+
 			} elseif (!empty($matches['comment'])) { // {* *}
 				$this->addToken(Token::COMMENT, $matches[0]);
 
@@ -320,9 +324,18 @@ public function setDelimiters($left, $right)
 		$this->macroRe = '
 			(?P<comment>' . $left . '\\*.*?\\*' . $right . '\n{0,2})|
 			' . $left . '
-				(?P<macro>(?:' . self::RE_STRING . '|\{
-						(?P<inner>' . self::RE_STRING . '|\{(?P>inner)\}|[^\'"{}])*+
-				\}|[^\'"{}])+?)
+				(?P<macro>(?:' . self::RE_STRING . '|
+					\{(?P<inner>' . self::RE_STRING . '|
+					\{(?P>inner)\}|
+					[^\'"{}])*+\}|
+					[^\'"{}]|
+					(?P<malformed>
+						\'(?:\\\\.|[^\'\\\\])*|
+						(?:\\\\.|[^\'\\\\])*\'|
+						"(?:\\\\.|[^"\\\\])*|
+						(?:\\\\.|[^"\\\\])*"
+					)
+				)+?)
 			' . $right . '
 			(?P<rmargin>[ \t]*(?=\n))?
 		';

diff --git a/tests/Nette/Latte/Parser.invalid.phpt b/tests/Nette/Latte/Parser.invalid.phpt
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Test: Nette\Latte\Parser::parse() - invalid macro.
+ *
+ * @author     Michael Moravec
+ * @package    Nette\Latte
+ * @subpackage UnitTests
+ */
+
+use Nette\Latte;
+
+
+
+require __DIR__ . '/../bootstrap.php';
+
+require __DIR__ . '/Template.inc';
+
+
+
+$parser = new Latte\Parser();
+
+Assert::throws(function () use ($parser) {
+	$parser->parse('{var foo = \'nette}');
+}, 'Nette\Latte\CompileException', 'Malformed macro declaration {%a%}.');
+Assert::throws(function () use ($parser) {
+	$parser->parse('{var foo = nette\'}');
+}, 'Nette\Latte\CompileException', 'Malformed macro declaration {%a%}.');
+Assert::throws(function () use ($parser) {
+	$parser->parse('{var foo = "nette}');
+}, 'Nette\Latte\CompileException', 'Malformed macro declaration {%a%}.');
+Assert::throws(function () use ($parser) {
+	$parser->parse('{var foo = nette"}');
+}, 'Nette\Latte\CompileException', 'Malformed macro declaration {%a%}.');