smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2026-05-05 12:14:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- reverted ./ and ../ handling in fetch() and display() - they're allowed again

Browse Source
This commit is contained in:
rodneyrehm
2011-09-21 23:06:27 +00:00
parent 95ab01f99f
commit 48295d9573
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/sysplugins/smarty_resource.php
+8 -8
View File
@@ -164,12 +164,11 @@ abstract class Smarty_Resource {
// as expansions (like include_path) have already been done
$file = getcwd() . DS . $file;
}
} elseif ($_file_is_dotted) {
throw new SmartyException("Template '{$file}' may not start with ../ or ./'");
}
}
// resolve relative path
if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
$_was_relative_prefix = $file[0] == '.' ? substr($file, 0, strpos($file, '|')) : null;
$_path = DS . trim($file, '/\\');
$_was_relative = true;
} else {
@@ -201,8 +200,13 @@ abstract class Smarty_Resource {
}
// revert to relative
if (isset($_was_relative)) {
$_path = substr($_path, 1);
if (isset($_was_relative_prefix)){
$_path = $_was_relative_prefix . $_path;
} else {
$_path = substr($_path, 1);
}
}
// this is only required for directories
$file = rtrim($_path, '/\\');
@@ -213,10 +217,6 @@ abstract class Smarty_Resource {
// template_dir index?
if (preg_match('#^\[(?P<key>[^\]]+)\](?P<file>.+)$#', $file, $match)) {
if ($match['file'][0] == '.' && ($match['file'][1] == '.' || $match['file'][1] == '/' || $match['file'][1] == "\\")) {
throw new SmartyException("Template '{$match['file']}' may not start with ../ or ./'");
}
$_directory = null;
// try string indexes
if (isset($_directories[$match['key']])) {