diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-27 12:56:06 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-27 12:56:06 (GMT) |
| commit | 686c9adbd574cdd847f8c64556021aa3a502b5c7 (patch) | |
| tree | c26794656f03aeaa4688537b95e1b08b1ed56edc /Objects | |
| parent | 9aece75269872fa5cb942fb5ba642531de2d09fe (diff) | |
| download | cpython-686c9adbd574cdd847f8c64556021aa3a502b5c7.zip cpython-686c9adbd574cdd847f8c64556021aa3a502b5c7.tar.gz cpython-686c9adbd574cdd847f8c64556021aa3a502b5c7.tar.bz2 | |
Merged revisions 75367 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75367 | antoine.pitrou | 2009-10-11 23:03:26 +0200 (dim., 11 oct. 2009) | 4 lines
Issue #7084: Fix a (very unlikely) crash when printing a list from one
thread, and mutating it from another one. Patch by Scott Dial.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/listobject.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index 98d7e47..c5b1475 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -319,6 +319,7 @@ list_print(PyListObject *op, FILE *fp, int flags) { int rc; Py_ssize_t i; + PyObject *item; rc = Py_ReprEnter((PyObject*)op); if (rc != 0) { @@ -333,15 +334,19 @@ list_print(PyListObject *op, FILE *fp, int flags) fprintf(fp, "["); Py_END_ALLOW_THREADS for (i = 0; i < Py_SIZE(op); i++) { + item = op->ob_item[i]; + Py_INCREF(item); if (i > 0) { Py_BEGIN_ALLOW_THREADS fprintf(fp, ", "); Py_END_ALLOW_THREADS } - if (PyObject_Print(op->ob_item[i], fp, 0) != 0) { + if (PyObject_Print(item, fp, 0) != 0) { + Py_DECREF(item); Py_ReprLeave((PyObject *)op); return -1; } + Py_DECREF(item); } Py_BEGIN_ALLOW_THREADS fprintf(fp, "]"); |