Skip to content

Relax possible E_ERROR condition to an Error exception #17285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 27, 2024
Merged

Relax possible E_ERROR condition to an Error exception #17285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fdde69
Relax possible E_ERROR condition to an Error exception
nielsdos Dec 27, 2024
1068c03
correction
nielsdos Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ext/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,13 +1596,12 @@ PHP_METHOD(GlobIterator, count)
RETURN_THROWS();
}

if (spl_intern_is_glob(intern)) {
RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL));
} else {
/* This can happen by abusing destructors. */
/* TODO: relax this from E_ERROR to an exception */
php_error_docref(NULL, E_ERROR, "GlobIterator lost glob state");
}
/* The spl_filesystem_object_get_method_check() function is called prior to calling this function.
* Therefore, the directory entry cannot be NULL. However, if it is not NULL, then it must be a glob iterator
* by construction. */
ZEND_ASSERT(spl_intern_is_glob(intern));

RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL));
}
/* }}} */
#endif /* HAVE_GLOB */
Expand Down
Loading