Changeset 2595 for lang/php

Timestamp:

12/06/07 13:17:25 (5 years ago)

Author:

tasuku

Message:

r323@dhcp158 (orig r66): tasuku | 2007-09-12 21:53:08 +0900
include/extends file path check added

Files:

• lang/php/mumu/trunk/mumu.php (modified) (3 diffs)

lang/php/mumu/trunk/mumu.php

@@ -76 +76 @@
 class MuUtil {
   public static function getpath($basepath, $path) {
+    $basepath = realpath($basepath);
     $o = getcwd();
     chdir(dirname($basepath));
     $r = realpath($path);
+    if ($basepath == $realpath) {
+      // avoid include/extends loop
+      return false;
+    }
     chdir($o);
     return $r;
@@ -230 +235 @@
     $this->block_dict = $block_dict;
     if ($parentPath && $path) {
-      $epath = MuUtil::getpath($path, $parentPath);
-      if (($this->parent_tfile = MuParser::parse_from_file($epath)) === false) {
-        // TODO: ���顼���������ƥ�졼�������˶����Ƥ�����     }
+      if (($epath = MuUtil::getpath($path, $parentPath)) === false
+          || ($this->parent_tfile = MuParser::parse_from_file($epath)) === false) {
+        throw new MuParserException('invalid filename specified on extends');
+      }
     }
   }
@@ -303 +309 @@
   private $tplfile;
   function __construct($includePath, $path) {
-    // FIXME: �������ƥ�����å���̵�¥롼�ץ���å�
-    $epath = MuUtil::getpath($path, $includePath);
-    if (($this->tplfile = MuParser::parse_from_file($epath)) === false) {
-      // TODO: ���顼���������ƥ�졼�������˶����Ƥ�����     $this->tplfile = $this->make_errornode('invalidfilename_include');
+    if (($epath = MuUtil::getpath($path, $includePath)) === false
+        || ($this->tplfile = MuParser::parse_from_file($epath)) === false) {
+      throw new MuParserException('include filename is invalid');
     }
   }