From: Etienne Kneuss <colder@php.net>
Date: Tue, 8 Jul 2008 22:49:35 +0000 (+0000)
Subject: Woopsy
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1333
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cab636c24592c4476ce4a2aaff2271420e17878;p=php

Woopsy
---

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index c57cd2a0e7..1d5c8b6bb6 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -394,7 +394,7 @@ void spl_filesystem_info_set_filename(spl_filesystem_object *intern, zend_uchar
 			
 			if (type == IS_UNICODE) {
 				slash_pos.u = (p1.u > p2.u ? p1.u : p2.u);
-				if (IS_SLASH_AT(type, intern->file_name, intern->file_name_len)) {
+				if (IS_SLASH_AT(type, intern->file_name, intern->file_name_len-1)) {
 					intern->file_name_len = slash_pos.u - intern->file_name.u;
 					intern->file_name.u[intern->file_name_len] = 0;
 					continue;
@@ -402,7 +402,7 @@ void spl_filesystem_info_set_filename(spl_filesystem_object *intern, zend_uchar
 				intern->_path_len = slash_pos.u - intern->file_name.u;
 			} else {
 				slash_pos.s = (p1.s > p2.s ? p1.s : p2.s);
-				if (IS_SLASH_AT(type, intern->file_name, intern->file_name_len)) {
+				if (IS_SLASH_AT(type, intern->file_name, intern->file_name_len-1)) {
 					intern->file_name_len = slash_pos.s - intern->file_name.s;
 					intern->file_name.s[intern->file_name_len] = 0;
 					continue;
diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt
index ef38de85de..79ea0497ca 100755
--- a/ext/spl/tests/fileobject_003.phpt
+++ b/ext/spl/tests/fileobject_003.phpt
@@ -71,15 +71,15 @@ unicode(%d) "%stests"
 ===1===
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
-  unicode(%d) "%s"
+  unicode(%d) "%s%etests"
   [u"fileName":u"SplFileInfo":private]=>
-  unicode(%d) ""
+  unicode(%d) "tests"
 }
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
   unicode(%d) "%s"
   [u"fileName":u"SplFileInfo":private]=>
-  unicode(%d) ""
+  unicode(%d) "tests"
 }
 bool(false)
 bool(true)
@@ -92,8 +92,8 @@ bool(true)
 string(%d) "%sspl"
 bool(true)
 unicode(%d) "%stests"
-unicode(%d) "%stests"
-unicode(%d) "%stests"
+unicode(%d) "tests"
+unicode(%d) "%s%espl"
 ===2===
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
@@ -103,7 +103,7 @@ object(SplFileInfo)#%d (2) {
 }
 object(SplFileInfo)#%d (2) {
   [u"pathName":u"SplFileInfo":private]=>
-  unicode(%d) "%s"
+  unicode(%d) "%s%etests"
   [u"fileName":u"SplFileInfo":private]=>
   unicode(%d) "%s"
 }