php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove include "sanity check" to get better error (#19650)"

Browse Source 
This reverts commit ca4a841921.

We like the error message change, but not the downgrade to notice
at this time in the release cycle.

@bukka will come back around
This commit is contained in:
Joe Watkins
2025-09-01 14:10:59 +02:00
parent ca4a841921
commit cb9af8d532
4 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Zend/tests/require_directory.phpt
View File

@@ -1,21 +0,0 @@
--TEST--
Including a directory generates an error
--SKIPIF--
<?php
if (PHP_OS_FAMILY === 'Windows') die("skip Not for Windows");
?>
--FILE--
<?php
/* Just a random test directory */
$dir = __DIR__ . '/variadic';
require $dir;
?>
--EXPECTF--
Notice: require(): Read of %d bytes failed with errno=21 Is a directory in %s on line %d
Fatal error: Uncaught Error: Failed opening required '%s' (include_path='.:') in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d

21
Zend/tests/require_directory_windows.phpt
View File

@@ -1,21 +0,0 @@
--TEST--
Including a directory generates an error (Windows variant)
--SKIPIF--
<?php
if (PHP_OS_FAMILY !== 'Windows') die("skip Only for Windows");
?>
--FILE--
<?php
/* Just a random test directory */
$dir = __DIR__ . '/variadic';
require $dir;
?>
--EXPECTF--
Warning: require(%s): Failed to open stream: Permission denied in %s on line %d
Fatal error: Uncaught Error: Failed opening required '%s' (include_path='%s') in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d

6
ext/standard/tests/file/bug35740.phpt
View File

@@ -1,9 +1,5 @@
--TEST--
Bug #35740 (memory leak when including a directory)
--SKIPIF--
<?php
if (PHP_OS_FAMILY === 'Windows') die("skip Not for Windows");
?>
--FILE--
<?php
@@ -12,7 +8,7 @@ include (__DIR__);
echo "Done\n";
?>
--EXPECTF--
Notice: include(): Read of %s bytes failed with errno=21 Is a directory in %s on line %d
Warning: include(%s): Failed to open stream: %s in %s on line %d
Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d
Done

26
main/streams/plain_wrapper.c
View File

@@ -135,6 +135,7 @@ typedef struct {
unsigned is_pipe:1; /* stream is an actual pipe, currently Windows only*/
unsigned cached_fstat:1; /* sb is valid */
unsigned is_pipe_blocking:1; /* allow blocking read() on pipes, currently Windows only */
unsigned no_forced_fstat:1; /* Use fstat cache even if forced */
unsigned is_seekable:1; /* don't try and seek, if not set */
unsigned _reserved:26;
@@ -160,7 +161,7 @@ typedef struct {
static int do_fstat(php_stdio_stream_data *d, int force)
{
if (!d->cached_fstat || force) {
if (!d->cached_fstat || (force && !d->no_forced_fstat)) {
int fd;
int r;
@@ -1187,7 +1188,30 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, zen
efree(persistent_id);
}
/* WIN32 always set ISREG flag */
#ifndef PHP_WIN32
/* sanity checks for include/require.
* We check these after opening the stream, so that we save
* on fstat() syscalls */
if (options & STREAM_OPEN_FOR_INCLUDE) {
php_stdio_stream_data *self = (php_stdio_stream_data*)ret->abstract;
int r;
r = do_fstat(self, 0);
if ((r == 0 && !S_ISREG(self->sb.st_mode))) {
if (opened_path) {
zend_string_release_ex(*opened_path, 0);
*opened_path = NULL;
}
php_stream_close(ret);
return NULL;
}
/* Make sure the fstat result is reused when we later try to get the
* file size. */
self->no_forced_fstat = 1;
}
if (options & STREAM_USE_BLOCKING_PIPE) {
php_stdio_stream_data *self = (php_stdio_stream_data*)ret->abstract;
self->is_pipe_blocking = 1;