Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c655a726
Commit
c655a726
authored
Jul 05, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows.
parent
bb4a747b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
Misc/NEWS
Misc/NEWS
+3
-1
Modules/_io/fileio.c
Modules/_io/fileio.c
+8
-0
No files found.
Misc/NEWS
View file @
c655a726
...
...
@@ -10,6 +10,8 @@ What's New in Python 3.2.2?
Core and Builtins
-----------------
- Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows.
- When a generator yields, do not retain the caller's exception state on the
generator.
...
...
@@ -908,7 +910,7 @@ Core and Builtins
(length bigger than 2^31-1 bytes).
- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and
stdprinter.write() clamp the length to
2^31-1
on Windows.
stdprinter.write() clamp the length to
INT_MAX
on Windows.
- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime()
can now handle dates after 2038.
...
...
Modules/_io/fileio.c
View file @
c655a726
...
...
@@ -664,6 +664,10 @@ fileio_read(fileio *self, PyObject *args)
return
fileio_readall
(
self
);
}
#if defined(MS_WIN64) || defined(MS_WINDOWS)
if
(
size
>
INT_MAX
)
size
=
INT_MAX
;
#endif
bytes
=
PyBytes_FromStringAndSize
(
NULL
,
size
);
if
(
bytes
==
NULL
)
return
NULL
;
...
...
@@ -672,7 +676,11 @@ fileio_read(fileio *self, PyObject *args)
if
(
_PyVerify_fd
(
self
->
fd
))
{
Py_BEGIN_ALLOW_THREADS
errno
=
0
;
#if defined(MS_WIN64) || defined(MS_WINDOWS)
n
=
read
(
self
->
fd
,
ptr
,
(
int
)
size
);
#else
n
=
read
(
self
->
fd
,
ptr
,
size
);
#endif
Py_END_ALLOW_THREADS
}
else
n
=
-
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment