ext/phar: offsetExists should return false when file entry is not based on PharFileInfo

Girgias · Girgias · commit ca3e3799505e · 2024-06-08T00:43:09.000+01:00
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -3527,6 +3527,10 @@ PHP_METHOD(Phar, offsetExists)
 		}
 		RETURN_TRUE;
 	} else {
+		/* If the info class is not based on PharFileInfo, directories are not directly instantiable */
+		if (UNEXPECTED(!instanceof_function(phar_obj->spl.info_class, phar_ce_entry))) {
+			RETURN_FALSE;
+		}
 		if (zend_hash_str_exists(&phar_obj->archive->virtual_dirs, fname, (uint32_t) fname_len)) {
 			RETURN_TRUE;
 		}
diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt
@@ -49,7 +49,7 @@ object(PharFileInfo)#%d (2) {
 }
 bool(true)
 phar:///%s/phar_oo_011.phar.php/hi/f.php
-bool(true)
+bool(false)
 LogicException: Cannot use SplFileObject with directories
 bool(true)
 hi

Original file line number	Diff line number	Diff line change
`@@ -3527,6 +3527,10 @@ PHP_METHOD(Phar, offsetExists)`
`3527`	`3527`	`}`
`3528`	`3528`	`RETURN_TRUE;`
`3529`	`3529`	`} else {`
	`3530`	`+ /* If the info class is not based on PharFileInfo, directories are not directly instantiable */`
	`3531`	`+ if (UNEXPECTED(!instanceof_function(phar_obj->spl.info_class, phar_ce_entry))) {`
	`3532`	`+ RETURN_FALSE;`
	`3533`	`+ }`
`3530`	`3534`	`if (zend_hash_str_exists(&phar_obj->archive->virtual_dirs, fname, (uint32_t) fname_len)) {`
`3531`	`3535`	`RETURN_TRUE;`
`3532`	`3536`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ object(PharFileInfo)#%d (2) {`
`49`	`49`	`}`
`50`	`50`	`bool(true)`
`51`	`51`	`phar:///%s/phar_oo_011.phar.php/hi/f.php`
`52`		`-bool(true)`
	`52`	`+bool(false)`
`53`	`53`	`LogicException: Cannot use SplFileObject with directories`
`54`	`54`	`bool(true)`
`55`	`55`	`hi`