From bce536067c803c47e33508b5c85798e0ba038d46 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Mon, 29 May 2023 16:16:01 +0200
Subject: [PATCH] Fix GH-11338: SplFileInfo empty getBasename with more than
 one slash

Regressed in 13e4ce386bb7.

Closes GH-11340.
---
 NEWS                       |  4 ++++
 ext/spl/spl_directory.c    |  4 +++-
 ext/spl/tests/gh11338.phpt | 47 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 ext/spl/tests/gh11338.phpt

diff --git a/NEWS b/NEWS
index 143418e2a30d2..e587b833339e6 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,10 @@ PHP                                                                        NEWS
   . Fix allocation loop in zend_shared_alloc_startup(). (nielsdos)
   . Access violation on smm_shared_globals with ALLOC_FALLBACK. (KoudelkaB)
 
+- SPL:
+  . Fixed bug GH-11338 (SplFileInfo empty getBasename with more than one
+    slash). (nielsdos)
+
 - Standard:
   . Fix access on NULL pointer in array_merge_recursive(). (ilutov)
   . Fix exception handling in array_multisort(). (ilutov)
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index aefa2aa933e51..b00a1e66568e0 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -432,7 +432,9 @@ static void spl_filesystem_info_set_filename(spl_filesystem_object *intern, zend
 
 	path_len = ZSTR_LEN(path);
 	if (path_len > 1 && IS_SLASH_AT(ZSTR_VAL(path), path_len-1)) {
-		path_len--;
+		do {
+			path_len--;
+		} while (path_len > 1 && IS_SLASH_AT(ZSTR_VAL(path), path_len - 1));
 		intern->file_name = zend_string_init(ZSTR_VAL(path), path_len, 0);
 	} else {
 		intern->file_name = zend_string_copy(path);
diff --git a/ext/spl/tests/gh11338.phpt b/ext/spl/tests/gh11338.phpt
new file mode 100644
index 0000000000000..0a59cea9e7468
--- /dev/null
+++ b/ext/spl/tests/gh11338.phpt
@@ -0,0 +1,47 @@
+--TEST--
+GH-11338 (SplFileInfo empty getBasename with more than on slash)
+--FILE--
+<?php
+
+function test($path) {
+    echo "Testing: '$path'\n";
+    $file = new \SplFileInfo($path);
+    var_dump($file->getBasename());
+    var_dump($file->getFilename());
+}
+
+test('/dir/anotherdir/basedir//');
+test('/dir/anotherdir/basedir/');
+test('/dir/anotherdir/basedir');
+test('/dir/anotherdir//basedir');
+test('///');
+test('//');
+test('/');
+test('');
+
+?>
+--EXPECT--
+Testing: '/dir/anotherdir/basedir//'
+string(7) "basedir"
+string(7) "basedir"
+Testing: '/dir/anotherdir/basedir/'
+string(7) "basedir"
+string(7) "basedir"
+Testing: '/dir/anotherdir/basedir'
+string(7) "basedir"
+string(7) "basedir"
+Testing: '/dir/anotherdir//basedir'
+string(7) "basedir"
+string(7) "basedir"
+Testing: '///'
+string(0) ""
+string(1) "/"
+Testing: '//'
+string(0) ""
+string(1) "/"
+Testing: '/'
+string(0) ""
+string(1) "/"
+Testing: ''
+string(0) ""
+string(0) ""