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
638cee62
Commit
638cee62
authored
Oct 28, 2010
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #9295: Fix a crash under Windows when calling close() on a file
object with custom buffering from two threads at once.
parent
658370e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
Misc/NEWS
Misc/NEWS
+3
-0
Objects/fileobject.c
Objects/fileobject.c
+6
-0
No files found.
Misc/NEWS
View file @
638cee62
...
...
@@ -63,6 +63,9 @@ Core and Builtins
Library
-------
- Issue #9295: Fix a crash under Windows when calling close() on a file
object with custom buffering from two threads at once.
- Issue #5027: The standard ``xml`` namespace is now understood by
xml.sax.saxutils.XMLGenerator as being bound to
http://www.w3.org/XML/1998/namespace. Patch by Troy J. Farrell.
...
...
Objects/fileobject.c
View file @
638cee62
...
...
@@ -423,6 +423,7 @@ close_the_file(PyFileObject *f)
int
sts
=
0
;
int
(
*
local_close
)(
FILE
*
);
FILE
*
local_fp
=
f
->
f_fp
;
char
*
local_setbuf
=
f
->
f_setbuf
;
if
(
local_fp
!=
NULL
)
{
local_close
=
f
->
f_close
;
if
(
local_close
!=
NULL
&&
f
->
unlocked_count
>
0
)
{
...
...
@@ -446,10 +447,15 @@ close_the_file(PyFileObject *f)
* called. */
f
->
f_fp
=
NULL
;
if
(
local_close
!=
NULL
)
{
/* Issue #9295: must temporarily reset f_setbuf so that another
thread doesn't free it when running file_close() concurrently.
Otherwise this close() will crash when flushing the buffer. */
f
->
f_setbuf
=
NULL
;
Py_BEGIN_ALLOW_THREADS
errno
=
0
;
sts
=
(
*
local_close
)(
local_fp
);
Py_END_ALLOW_THREADS
f
->
f_setbuf
=
local_setbuf
;
if
(
sts
==
EOF
)
return
PyErr_SetFromErrno
(
PyExc_IOError
);
if
(
sts
!=
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