Skip to content

FIX file_get_contents() on Windows fails with "errno=22 Invalid argument" #13948

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

Closed
wants to merge 4 commits into from
Closed

FIX file_get_contents() on Windows fails with "errno=22 Invalid argument" #13948

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3802a30
FIX file_get_contents() on Windows fails with "errno=22 Invalid argum…
DnwK98 Apr 12, 2024
9ef8bbe
Simplify buffer size for write also.
DnwK98 Apr 12, 2024
0b8154d
Revert oversimplification
DnwK98 Apr 12, 2024
4d0be19
Add test for reading big files by file_get_contents.
DnwK98 Apr 12, 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
4 changes: 2 additions & 2 deletions main/streams/plain_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ extern int php_get_gid_by_name(const char *name, gid_t *gid);
#endif

#if defined(PHP_WIN32)
# define PLAIN_WRAP_BUF_SIZE(st) (((st) > UINT_MAX) ? UINT_MAX : (unsigned int)(st))
# define PLAIN_WRAP_BUF_SIZE(st) ((unsigned int)(st > INT_MAX ? INT_MAX : st))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch. I think it is possible to simplify line 356/360, what do you think ?

#define fsync _commit
#define fdatasync fsync
#else
Expand Down Expand Up @@ -354,7 +354,7 @@ static ssize_t php_stdiop_write(php_stream *stream, const char *buf, size_t coun

if (data->fd >= 0) {
#ifdef PHP_WIN32
ssize_t bytes_written = _write(data->fd, buf, (unsigned int)(count > INT_MAX ? INT_MAX : count));
ssize_t bytes_written = _write(data->fd, buf, PLAIN_WRAP_BUF_SIZE(count));
#else
ssize_t bytes_written = write(data->fd, buf, count);
#endif
Expand Down