mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-14 12:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

closeder/readdir/rewinddir must work only with directories

Browse Source
This commit is contained in:
Dmitry Stogov 2008-06-11 09:01:44 +00:00
parent fbe28c49b3
commit 00ea3108ea
5 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/standard/dir.c
View File

@ -282,6 +282,11 @@ PHP_FUNCTION(closedir)
FETCH_DIRP();
if (!(dirp->flags & PHP_STREAM_FLAG_IS_DIR)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a valid Directory resource", dirp->rsrc_id);
RETURN_FALSE;
}
rsrc_id = dirp->rsrc_id;
zend_list_delete(dirp->rsrc_id);
@ -384,6 +389,11 @@ PHP_FUNCTION(rewinddir)
FETCH_DIRP();
if (!(dirp->flags & PHP_STREAM_FLAG_IS_DIR)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a valid Directory resource", dirp->rsrc_id);
RETURN_FALSE;
}
php_stream_rewinddir(dirp);
}
/* }}} */
@ -398,6 +408,11 @@ PHP_NAMED_FUNCTION(php_if_readdir)
FETCH_DIRP();
if (!(dirp->flags & PHP_STREAM_FLAG_IS_DIR)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a valid Directory resource", dirp->rsrc_id);
RETURN_FALSE;
}
if (php_stream_readdir(dirp, &entry)) {
RETURN_RT_STRINGL(entry.d_name, strlen(entry.d_name), ZSTR_DUPLICATE);
}

1
ext/standard/tests/dir/readdir_variation7.phpt
View File

@ -33,3 +33,4 @@ resource(%d) of type (stream)
Warning: readdir(): %d is not a valid Directory resource in %s on line %d
bool(false)
===DONE===

22
ext/standard/tests/dir/rewinddir_basic.phpt
View File

@ -69,16 +69,26 @@ resource(%d) of type (stream)
resource(%d) of type (stream)
-- Read and rewind first directory (argument supplied) --
unicode(1) "."
unicode(2) ".."
unicode(9) "file1.tmp"
array(3) {
[0]=>
unicode(1) "."
[1]=>
unicode(2) ".."
[2]=>
unicode(9) "file1.tmp"
}
NULL
unicode(1) "."
-- Read and rewind second directory (no argument supplied) --
unicode(1) "."
unicode(2) ".."
unicode(9) "file2.tmp"
array(3) {
[0]=>
unicode(1) "."
[1]=>
unicode(2) ".."
[2]=>
unicode(9) "file2.tmp"
}
NULL
unicode(1) "."
===DONE===

2
main/php_streams.h
View File

@ -189,6 +189,8 @@ struct _php_stream_wrapper {
#define PHP_STREAM_FLAG_NO_CLOSE 32
#define PHP_STREAM_FLAG_IS_DIR 64
struct _php_stream {
php_stream_ops *ops;
void *abstract; /* convenience pointer for abstraction */

2
main/streams/streams.c
View File

@ -2279,7 +2279,7 @@ PHPAPI php_stream *_php_stream_opendir(char *path, int options,
if (stream) {
stream->wrapper = wrapper;
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
stream->flags |= PHP_STREAM_FLAG_NO_BUFFER | PHP_STREAM_FLAG_IS_DIR;
}
} else if (wrapper) {
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC, "not implemented");