Woopsy

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index c57cd2a0e77232d0cae439e589d770712aca352d..1d5c8b6bb6c1079126babd2d810d72df20ec8239 100755 (executable)
--- 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 ef38de85de720c1ced84f27ac9ee32e3e5fd3b07..79ea0497caf902c5ef970b6e9ab1a04b627654b7 100755 (executable)
--- 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"
 }