geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 02:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect the Parser against recursive parsing issues

Browse Source
This commit is contained in:
Jordi Boggiano
2012-01-24 17:39:13 +01:00
parent d21592b189
commit b327a48a29
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Parser.php
+12 -1
View File
@@ -18,6 +18,7 @@
*/
class Twig_Parser implements Twig_ParserInterface
{
protected $stack = array();
protected $stream;
protected $parent;
protected $handlers;
@@ -61,6 +62,10 @@ class Twig_Parser implements Twig_ParserInterface
*/
public function parse(Twig_TokenStream $stream)
{
$vars = get_object_vars($this);
unset($vars['stack'], $vars['env']);
$this->stack[] = $vars;
$this->tmpVarCount = 0;
// tag handlers
@@ -102,7 +107,13 @@ class Twig_Parser implements Twig_ParserInterface
$traverser = new Twig_NodeTraverser($this->env, $this->visitors);
return $traverser->traverse($node);
$node = $traverser->traverse($node);
foreach (array_pop($this->stack) as $key => $val) {
$this->$key = $val;
}
return $node;
}
public function subparse($test, $dropNeedle = false)