From d226b077414248b5de69ddfdbf93512c71906f28 Mon Sep 17 00:00:00 2001
From: messju <messju@localhost>
Date: Sat, 9 Aug 2003 08:47:10 +0000
Subject: [PATCH] synced secure_dir-checking with trusted_dir-checking

---
 libs/core/core.is_secure.php  |  2 +-
 libs/core/core.is_trusted.php | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/libs/core/core.is_secure.php b/libs/core/core.is_secure.php
index ad74f41f..1a88489e 100644
--- a/libs/core/core.is_secure.php
+++ b/libs/core/core.is_secure.php
@@ -23,8 +23,8 @@ function smarty_core_is_secure($params, &$smarty)
 
     $_smarty_secure = false;
     if ($params['resource_type'] == 'file') {
-        $_rp = realpath($params['resource_name']);
         if (!empty($smarty->secure_dir)) {
+            $_rp = realpath($params['resource_name']);
             foreach ((array)$smarty->secure_dir as $curr_dir) {
                 if ( !empty($curr_dir) && is_readable ($curr_dir)) {
                     $_cd = realpath($curr_dir);
diff --git a/libs/core/core.is_trusted.php b/libs/core/core.is_trusted.php
index 922619b4..e20897b4 100644
--- a/libs/core/core.is_trusted.php
+++ b/libs/core/core.is_trusted.php
@@ -23,20 +23,19 @@ function smarty_core_is_trusted($params, &$smarty)
     $_smarty_trusted = false;
     if ($params['resource_type'] == 'file') {
         if (!empty($smarty->trusted_dir)) {
-            // see if template file is within a trusted directory. If so,
-            // disable security during the execution of the template.
-
-            if (!empty($smarty->trusted_dir)) {
-                foreach ((array)$smarty->trusted_dir as $curr_dir) {
-                    if (!empty($curr_dir) && is_readable ($curr_dir)) {
-                        if (substr(realpath($params['resource_name']),0, strlen(realpath($curr_dir))) == realpath($curr_dir)) {
-                            $_smarty_trusted = true;
-                            break;
-                        }
+            $_rp = realpath($params['resource_name']);
+            foreach ((array)$smarty->trusted_dir as $curr_dir) {
+                if (!empty($curr_dir) && is_readable ($curr_dir)) {
+                    $_cd = realpath($curr_dir);
+                    if (strncmp($_rp, $_cd, strlen($_cd)) == 0
+                        && $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
+                        $_smarty_trusted = true;
+                        break;
                     }
                 }
             }
         }
+
     } else {
         // resource is not on local file system
         $_smarty_trusted = call_user_func_array($smarty->_plugins['resource'][$params['resource_type']][0][3],