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
e6edec23
Commit
e6edec23
authored
Jan 04, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #9015, #9611: FileIO.readinto(), FileIO.write() and os.write() clamp the
length to 2^31-1 on Windows.
parent
560f9dab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
6 deletions
+30
-6
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_io/fileio.c
Modules/_io/fileio.c
+18
-4
Modules/posixmodule.c
Modules/posixmodule.c
+9
-2
No files found.
Misc/NEWS
View file @
e6edec23
...
...
@@ -8,6 +8,9 @@ What's New in Python 3.2 Release Candidate 1
Core and Builtins
-----------------
- Issue #9015, #9611: FileIO.readinto(), FileIO.write() and os.write() clamp
the length to 2^31-1 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 @
e6edec23
...
...
@@ -506,7 +506,7 @@ static PyObject *
fileio_readinto
(
fileio
*
self
,
PyObject
*
args
)
{
Py_buffer
pbuf
;
Py_ssize_t
n
;
Py_ssize_t
n
,
len
;
if
(
self
->
fd
<
0
)
return
err_closed
();
...
...
@@ -517,9 +517,16 @@ fileio_readinto(fileio *self, PyObject *args)
return
NULL
;
if
(
_PyVerify_fd
(
self
->
fd
))
{
len
=
pbuf
.
len
;
Py_BEGIN_ALLOW_THREADS
errno
=
0
;
n
=
read
(
self
->
fd
,
pbuf
.
buf
,
pbuf
.
len
);
#if defined(MS_WIN64) || defined(MS_WINDOWS)
if
(
len
>
INT_MAX
)
len
=
INT_MAX
;
n
=
read
(
self
->
fd
,
pbuf
.
buf
,
(
int
)
len
);
#else
n
=
read
(
self
->
fd
,
pbuf
.
buf
,
(
size_t
)
len
);
#endif
Py_END_ALLOW_THREADS
}
else
n
=
-
1
;
...
...
@@ -685,7 +692,7 @@ static PyObject *
fileio_write
(
fileio
*
self
,
PyObject
*
args
)
{
Py_buffer
pbuf
;
Py_ssize_t
n
;
Py_ssize_t
n
,
len
;
if
(
self
->
fd
<
0
)
return
err_closed
();
...
...
@@ -698,7 +705,14 @@ fileio_write(fileio *self, PyObject *args)
if
(
_PyVerify_fd
(
self
->
fd
))
{
Py_BEGIN_ALLOW_THREADS
errno
=
0
;
n
=
write
(
self
->
fd
,
pbuf
.
buf
,
pbuf
.
len
);
len
=
pbuf
.
len
;
#if defined(MS_WIN64) || defined(MS_WINDOWS)
if
(
len
>
INT_MAX
)
len
=
INT_MAX
;
n
=
write
(
self
->
fd
,
pbuf
.
buf
,
(
int
)
len
);
#else
n
=
write
(
self
->
fd
,
pbuf
.
buf
,
(
size_t
)
len
);
#endif
Py_END_ALLOW_THREADS
}
else
n
=
-
1
;
...
...
Modules/posixmodule.c
View file @
e6edec23
...
...
@@ -5696,7 +5696,7 @@ posix_write(PyObject *self, PyObject *args)
{
Py_buffer
pbuf
;
int
fd
;
Py_ssize_t
size
;
Py_ssize_t
size
,
len
;
if
(
!
PyArg_ParseTuple
(
args
,
"iy*:write"
,
&
fd
,
&
pbuf
))
return
NULL
;
...
...
@@ -5704,8 +5704,15 @@ posix_write(PyObject *self, PyObject *args)
PyBuffer_Release
(
&
pbuf
);
return
posix_error
();
}
len
=
pbuf
.
len
;
Py_BEGIN_ALLOW_THREADS
size
=
write
(
fd
,
pbuf
.
buf
,
(
size_t
)
pbuf
.
len
);
#if defined(MS_WIN64) || defined(MS_WINDOWS)
if
(
len
>
INT_MAX
)
len
=
INT_MAX
;
size
=
write
(
fd
,
pbuf
.
buf
,
(
int
)
len
);
#else
size
=
write
(
fd
,
pbuf
.
buf
,
(
size_t
)
len
);
#endif
Py_END_ALLOW_THREADS
PyBuffer_Release
(
&
pbuf
);
if
(
size
<
0
)
...
...
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