Add additional initialization checks to SplFileInfo

php · Oct 19, 2020 · 61b33e9 · 61b33e9
1 parent d0c2db4
commit 61b33e9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
@@ -899,6 +899,11 @@ PHP_METHOD(SplFileInfo, getFilename)
 		RETURN_THROWS();
 	}
 
+	if (!intern->file_name) {
+		zend_throw_error(NULL, "Object not initialized");
+		RETURN_THROWS();
+	}
+
 	spl_filesystem_object_get_path(intern, &path_len);
 
 	if (path_len && path_len < intern->file_name_len) {
@@ -937,6 +942,11 @@ PHP_METHOD(SplFileInfo, getExtension)
 		RETURN_THROWS();
 	}
 
+	if (!intern->file_name) {
+		zend_throw_error(NULL, "Object not initialized");
+		RETURN_THROWS();
+	}
+
 	spl_filesystem_object_get_path(intern, &path_len);
 
 	if (path_len && path_len < intern->file_name_len) {
@@ -1000,6 +1010,11 @@ PHP_METHOD(SplFileInfo, getBasename)
 		RETURN_THROWS();
 	}
 
+	if (!intern->file_name) {
+		zend_throw_error(NULL, "Object not initialized");
+		RETURN_THROWS();
+	}
+
 	spl_filesystem_object_get_path(intern, &path_len);
 
 	if (path_len && path_len < intern->file_name_len) {

diff --git a/ext/spl/tests/bug79987.phpt b/ext/spl/tests/bug79987.phpt
@@ -15,5 +15,24 @@ try {
 } catch (Throwable $e) {
     echo $e->getMessage() . "\n";
 }
+try {
+    var_dump($x->getFilename());
+} catch (Throwable $e) {
+    echo $e->getMessage() . "\n";
+}
+try {
+    var_dump($x->getExtension());
+} catch (Throwable $e) {
+    echo $e->getMessage() . "\n";
+}
+try {
+    var_dump($x->getBasename());
+} catch (Throwable $e) {
+    echo $e->getMessage() . "\n";
+}
+?>
 --EXPECT--
 Object not initialized
+Object not initialized
+Object not initialized
+Object not initialized