Mailman 3 January 2020 - Python-checkins

bpo-38631: Add _Py_NO_RETURN to functions calling Py_FatalError() (GH-18278)
by Victor Stinner Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/2a4903fcce54c25807d362dbbbcfb32d0b… commit: 2a4903fcce54c25807d362dbbbcfb32d0b494f9f branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-30T13:09:11+01:00 summary: bpo-38631: Add _Py_NO_RETURN to functions calling Py_FatalError() (GH-18278) Add _Py_NO_RETURN to functions calling Py_FatalError(): * _PyObject_AssertFailed() * dummy_dealloc() * faulthandler_fatal_error_thread() *… [View More] none_dealloc() * notimplemented_dealloc() files: M Include/cpython/object.h M Modules/faulthandler.c M Objects/object.c M Objects/setobject.c diff --git a/Include/cpython/object.h b/Include/cpython/object.h index 75e55995b5741..dc8fd6fa8987d 100644 --- a/Include/cpython/object.h +++ b/Include/cpython/object.h @@ -443,7 +443,7 @@ _PyObject_DebugTypeStats(FILE *out); NDEBUG against a Python built with NDEBUG defined. msg, expr and function can be NULL. */ -PyAPI_FUNC(void) _PyObject_AssertFailed( +PyAPI_FUNC(void) _Py_NO_RETURN _PyObject_AssertFailed( PyObject *obj, const char *expr, const char *msg, diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index b19401e94d85a..555e1afc9f82a 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -1065,24 +1065,10 @@ faulthandler_sigsegv(PyObject *self, PyObject *args) Py_RETURN_NONE; } -static void +static void _Py_NO_RETURN faulthandler_fatal_error_thread(void *plock) { -#ifndef __clang__ - PyThread_type_lock *lock = (PyThread_type_lock *)plock; -#endif - Py_FatalError("in new thread"); - -#ifndef __clang__ - /* Issue #28152: Py_FatalError() is declared with - __attribute__((__noreturn__)). GCC emits a warning without - "PyThread_release_lock()" (compiler bug?), but Clang is smarter and - emits a warning on the return. */ - - /* notify the caller that we are done */ - PyThread_release_lock(lock); -#endif } static PyObject * diff --git a/Objects/object.c b/Objects/object.c index c5d28e5f8d758..67a6386e2a51d 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1646,7 +1646,7 @@ none_repr(PyObject *op) } /* ARGUSED */ -static void +static void _Py_NO_RETURN none_dealloc(PyObject* ignore) { /* This should never get called, but we also don't want to SEGV if @@ -1784,7 +1784,7 @@ notimplemented_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) Py_RETURN_NOTIMPLEMENTED; } -static void +static void _Py_NO_RETURN notimplemented_dealloc(PyObject* ignore) { /* This should never get called, but we also don't want to SEGV if @@ -2225,7 +2225,7 @@ _PyTrash_thread_destroy_chain(void) } -void +void _Py_NO_RETURN _PyObject_AssertFailed(PyObject *obj, const char *expr, const char *msg, const char *file, int line, const char *function) { diff --git a/Objects/setobject.c b/Objects/setobject.c index 924885d7505a0..bb7c0b8f0456b 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -2529,7 +2529,7 @@ dummy_repr(PyObject *op) return PyUnicode_FromString("<dummy key>"); } -static void +static void _Py_NO_RETURN dummy_dealloc(PyObject* ignore) { Py_FatalError("deallocating <dummy key>"); [View Less]

1 0

bpo-38631: Replace Py_FatalError() with assert() in ceval.c (GH-18279)
by Victor Stinner Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/17c68b8107e348aeaaa05f7ac5072cacff… commit: 17c68b8107e348aeaaa05f7ac5072cacff916022 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-30T12:20:48+01:00 summary: bpo-38631: Replace Py_FatalError() with assert() in ceval.c (GH-18279) Replace a few Py_FatalError() calls if tstate is NULL with assert(tstate != NULL) in ceval.c. PyEval_AcquireThread(), PyEval_ReleaseThread() … [View More]and PyEval_RestoreThread() must never be called with a NULL tstate. files: M Doc/c-api/init.rst M Python/ceval.c diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 8913dbfe249dc..7ea48aec009c9 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -1110,7 +1110,7 @@ All of the following functions must be called after :c:func:`Py_Initialize`. .. c:function:: void PyEval_AcquireThread(PyThreadState *tstate) Acquire the global interpreter lock and set the current thread state to - *tstate*, which should not be ``NULL``. The lock must have been created earlier. + *tstate*, which must not be ``NULL``. The lock must have been created earlier. If this thread already has the lock, deadlock ensues. .. note:: diff --git a/Python/ceval.c b/Python/ceval.c index 2770dc6d08dd2..2bf64eda4224a 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -302,9 +302,7 @@ PyEval_ReleaseLock(void) void PyEval_AcquireThread(PyThreadState *tstate) { - if (tstate == NULL) { - Py_FatalError("PyEval_AcquireThread: NULL new thread state"); - } + assert(tstate != NULL); _PyRuntimeState *runtime = tstate->interp->runtime; struct _ceval_runtime_state *ceval = &runtime->ceval; @@ -321,9 +319,7 @@ PyEval_AcquireThread(PyThreadState *tstate) void PyEval_ReleaseThread(PyThreadState *tstate) { - if (tstate == NULL) { - Py_FatalError("PyEval_ReleaseThread: NULL thread state"); - } + assert(tstate != NULL); _PyRuntimeState *runtime = tstate->interp->runtime; PyThreadState *new_tstate = _PyThreadState_Swap(&runtime->gilstate, NULL); @@ -385,12 +381,10 @@ PyEval_SaveThread(void) void PyEval_RestoreThread(PyThreadState *tstate) { + assert(tstate != NULL); + _PyRuntimeState *runtime = tstate->interp->runtime; struct _ceval_runtime_state *ceval = &runtime->ceval; - - if (tstate == NULL) { - Py_FatalError("PyEval_RestoreThread: NULL tstate"); - } assert(gil_created(&ceval->gil)); int err = errno; [View Less]

1 0

bpo-38631: Avoid Py_FatalError() in unicodeobject.c (GH-18281)
by Victor Stinner Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/ec3c99c8a73650d7833189bd973ec49256… commit: ec3c99c8a73650d7833189bd973ec492564aa479 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-30T12:18:32+01:00 summary: bpo-38631: Avoid Py_FatalError() in unicodeobject.c (GH-18281) Replace Py_FatalError() calls with _PyErr_WriteUnraisableMsg(), _PyObject_ASSERT_FAILED_MSG() or Py_UNREACHABLE() in unicode_dealloc() and … [View More]unicode_release_interned(). files: M Objects/unicodeobject.c diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 1ec2accdb09f2..8e1161e5387b4 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1900,25 +1900,29 @@ unicode_dealloc(PyObject *unicode) case SSTATE_INTERNED_MORTAL: /* revive dead object temporarily for DelItem */ Py_REFCNT(unicode) = 3; - if (PyDict_DelItem(interned, unicode) != 0) - Py_FatalError( - "deletion of interned string failed"); + if (PyDict_DelItem(interned, unicode) != 0) { + _PyErr_WriteUnraisableMsg("deletion of interned string failed", + NULL); + } break; case SSTATE_INTERNED_IMMORTAL: - Py_FatalError("Immortal interned string died."); - /* fall through */ + _PyObject_ASSERT_FAILED_MSG(unicode, "Immortal interned string died"); + break; default: - Py_FatalError("Inconsistent interned string state."); + Py_UNREACHABLE(); } - if (_PyUnicode_HAS_WSTR_MEMORY(unicode)) + if (_PyUnicode_HAS_WSTR_MEMORY(unicode)) { PyObject_DEL(_PyUnicode_WSTR(unicode)); - if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) + } + if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) { PyObject_DEL(_PyUnicode_UTF8(unicode)); - if (!PyUnicode_IS_COMPACT(unicode) && _PyUnicode_DATA_ANY(unicode)) + } + if (!PyUnicode_IS_COMPACT(unicode) && _PyUnicode_DATA_ANY(unicode)) { PyObject_DEL(_PyUnicode_DATA_ANY(unicode)); + } Py_TYPE(unicode)->tp_free(unicode); } @@ -15401,14 +15405,10 @@ PyUnicode_InternFromString(const char *cp) static void unicode_release_interned(void) { - PyObject *keys; - PyObject *s; - Py_ssize_t i, n; - Py_ssize_t immortal_size = 0, mortal_size = 0; - - if (interned == NULL || !PyDict_Check(interned)) + if (interned == NULL || !PyDict_Check(interned)) { return; - keys = PyDict_Keys(interned); + } + PyObject *keys = PyDict_Keys(interned); if (keys == NULL || !PyList_Check(keys)) { PyErr_Clear(); return; @@ -15419,30 +15419,35 @@ unicode_release_interned(void) rather, we give them their stolen references back, and then clear and DECREF the interned dict. */ - n = PyList_GET_SIZE(keys); + Py_ssize_t n = PyList_GET_SIZE(keys); #ifdef INTERNED_STATS fprintf(stderr, "releasing %" PY_FORMAT_SIZE_T "d interned strings\n", n); + + Py_ssize_t immortal_size = 0, mortal_size = 0; #endif - for (i = 0; i < n; i++) { - s = PyList_GET_ITEM(keys, i); + for (Py_ssize_t i = 0; i < n; i++) { + PyObject *s = PyList_GET_ITEM(keys, i); if (PyUnicode_READY(s) == -1) { Py_UNREACHABLE(); } switch (PyUnicode_CHECK_INTERNED(s)) { - case SSTATE_NOT_INTERNED: - /* XXX Shouldn't happen */ - break; case SSTATE_INTERNED_IMMORTAL: Py_REFCNT(s) += 1; +#ifdef INTERNED_STATS immortal_size += PyUnicode_GET_LENGTH(s); +#endif break; case SSTATE_INTERNED_MORTAL: Py_REFCNT(s) += 2; +#ifdef INTERNED_STATS mortal_size += PyUnicode_GET_LENGTH(s); +#endif break; + case SSTATE_NOT_INTERNED: + /* fall through */ default: - Py_FatalError("Inconsistent interned string state."); + Py_UNREACHABLE(); } _PyUnicode_STATE(s).interned = SSTATE_NOT_INTERNED; } [View Less]

1 0

bpo-39424: Use assertRaisesRegex instead of assertRaisesRegexp. (GH-18277)
by damani42 Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/38c878b56cff997de8fb04a586c963039b… commit: 38c878b56cff997de8fb04a586c963039b69b414 branch: master author: damani42 <56308939+damani42(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-30T12:26:22+02:00 summary: bpo-39424: Use assertRaisesRegex instead of assertRaisesRegexp. (GH-18277) files: M Lib/test/test_signal.py diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 5b072b0c60ee3..… [View More]

1 0

bpo-39497: Remove unused variable from pysqlite_cursor_executescript (GH-18271)
by Alex Henrie Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/1f44e775df8e7ec3ca60a1135cb3279f8b… commit: 1f44e775df8e7ec3ca60a1135cb3279f8b9dca3e branch: master author: Alex Henrie <alexhenrie24(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-01-30T12:39:25+03:00 summary: bpo-39497: Remove unused variable from pysqlite_cursor_executescript (GH-18271) files: M Modules/_sqlite/cursor.c diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 47dbc77474120..2302ca9edac2d … [View More]

1 0

bpo-39353: binascii.crc_hqx() is no longer deprecated (GH-18276)
by Victor Stinner Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/c38fd0df2b4cbc1cc906d8dfe23f63b67c… commit: c38fd0df2b4cbc1cc906d8dfe23f63b67cd6965f branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-30T09:56:40+01:00 summary: bpo-39353: binascii.crc_hqx() is no longer deprecated (GH-18276) The binascii.crc_hqx() function is no longer deprecated. files: A Misc/NEWS.d/next/Library/2020-01-30-09-07-16.bpo-39353.wTl9hc.rst M Doc/library/… [View More]binascii.rst M Doc/whatsnew/3.9.rst M Lib/binhex.py M Lib/test/test_binascii.py M Modules/binascii.c diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index aa2a27084c34c..2c0c1bce5d7f8 100644 --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -132,8 +132,6 @@ The :mod:`binascii` module defines the following functions: *x*:sup:`16` + *x*:sup:`12` + *x*:sup:`5` + 1, often represented as 0x1021. This CRC is used in the binhex4 format. - .. deprecated:: 3.9 - .. function:: crc32(data[, value]) diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst index a4c4266bfc35d..c8f407751ec5e 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -379,7 +379,6 @@ Deprecated * :func:`~binascii.b2a_hqx`, :func:`~binascii.a2b_hqx` * :func:`~binascii.rlecode_hqx`, :func:`~binascii.rledecode_hqx` - * :func:`~binascii.crc_hqx` (Contributed by Victor Stinner in :issue:`39353`.) diff --git a/Lib/binhex.py b/Lib/binhex.py index 6ff38dd8229c8..9559f46d5a288 100644 --- a/Lib/binhex.py +++ b/Lib/binhex.py @@ -200,8 +200,7 @@ def _writeinfo(self, name, finfo): self._writecrc() def _write(self, data): - with _ignore_deprecation_warning(): - self.crc = binascii.crc_hqx(data, self.crc) + self.crc = binascii.crc_hqx(data, self.crc) self.ofp.write(data) def _writecrc(self): @@ -396,8 +395,7 @@ def __init__(self, ifp): def _read(self, len): data = self.ifp.read(len) - with _ignore_deprecation_warning(): - self.crc = binascii.crc_hqx(data, self.crc) + self.crc = binascii.crc_hqx(data, self.crc) return data def _checkcrc(self): diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index 649edbe295413..45327953a7701 100644 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -435,9 +435,6 @@ def test_deprecated_warnings(self): with self.assertWarns(DeprecationWarning): self.assertEqual(binascii.rledecode_hqx(b'a\x90\n'), b'a' * 10) - with self.assertWarns(DeprecationWarning): - self.assertEqual(binascii.crc_hqx(b'abc', 0), 40406) - class ArrayBinASCIITest(BinASCIITest): def type2test(self, s): diff --git a/Misc/NEWS.d/next/Library/2020-01-30-09-07-16.bpo-39353.wTl9hc.rst b/Misc/NEWS.d/next/Library/2020-01-30-09-07-16.bpo-39353.wTl9hc.rst new file mode 100644 index 0000000000000..b6db7c5c58842 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-30-09-07-16.bpo-39353.wTl9hc.rst @@ -0,0 +1 @@ +The :func:`binascii.crc_hqx` function is no longer deprecated. diff --git a/Modules/binascii.c b/Modules/binascii.c index c6da3e0a635bc..e428b0d6f963f 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -965,11 +965,6 @@ static PyObject * binascii_crc_hqx_impl(PyObject *module, Py_buffer *data, unsigned int crc) /*[clinic end generated code: output=2fde213d0f547a98 input=56237755370a951c]*/ { - if (PyErr_WarnEx(PyExc_DeprecationWarning, - "binascii.crc_hqx() is deprecated", 1) < 0) { - return NULL; - } - const unsigned char *bin_data; Py_ssize_t len; [View Less]

1 0

bpo-38631: Replace tp_new_wrapper() fatal error with SystemError (GH-18262)
by Victor Stinner Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/2bf127d97bd1d60ead7c20d429b0c61ef6… commit: 2bf127d97bd1d60ead7c20d429b0c61ef61fc554 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-30T09:02:49+01:00 summary: bpo-38631: Replace tp_new_wrapper() fatal error with SystemError (GH-18262) tp_new_wrapper() now raises a SystemError if called with non-type self, rather than calling Py_FatalError() which cannot be catched. files:… [View More]

1 0

bpo-38631: Avoid Py_FatalError() in init_slotdefs() (GH-18263)
by Victor Stinner Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/7a1f6c2da46a04d0ff0acc01542f30bfea… commit: 7a1f6c2da46a04d0ff0acc01542f30bfeaf0e0c7 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-30T09:02:14+01:00 summary: bpo-38631: Avoid Py_FatalError() in init_slotdefs() (GH-18263) Rename init_slotdefs() to _PyTypes_InitSlotDefs() and add a return value of type PyStatus. The function is now called exactly once from _PyTypes_Init(). … [View More]Replace calls to init_slotdefs() with an assertion checking that slotdefs is initialized. files: M Include/internal/pycore_pylifecycle.h M Objects/object.c M Objects/typeobject.c diff --git a/Include/internal/pycore_pylifecycle.h b/Include/internal/pycore_pylifecycle.h index 72923498decd0..2dd6149a6b3d3 100644 --- a/Include/internal/pycore_pylifecycle.h +++ b/Include/internal/pycore_pylifecycle.h @@ -51,6 +51,7 @@ extern int _PyFloat_Init(void); extern PyStatus _Py_HashRandomization_Init(const PyConfig *); extern PyStatus _PyTypes_Init(void); +extern PyStatus _PyTypes_InitSlotDefs(void); extern PyStatus _PyImportZip_Init(PyThreadState *tstate); extern PyStatus _PyGC_Init(PyThreadState *tstate); diff --git a/Objects/object.c b/Objects/object.c index aa84114c55471..c5d28e5f8d758 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -6,6 +6,7 @@ #include "pycore_initconfig.h" #include "pycore_object.h" #include "pycore_pyerrors.h" +#include "pycore_pylifecycle.h" #include "pycore_pystate.h" #include "frameobject.h" #include "interpreteridobject.h" @@ -1841,6 +1842,11 @@ PyObject _Py_NotImplementedStruct = { PyStatus _PyTypes_Init(void) { + PyStatus status = _PyTypes_InitSlotDefs(); + if (_PyStatus_EXCEPTION(status)) { + return status; + } + #define INIT_TYPE(TYPE, NAME) \ do { \ if (PyType_Ready(TYPE) < 0) { \ diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 5773eb7096e0c..b095e2921dcf2 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2,6 +2,7 @@ #include "Python.h" #include "pycore_call.h" +#include "pycore_initconfig.h" #include "pycore_object.h" #include "pycore_pyerrors.h" #include "pycore_pystate.h" @@ -6932,7 +6933,8 @@ which incorporates the additional structures used for numbers, sequences and mappings. Note that multiple names may map to the same slot (e.g. __eq__, __ne__ etc. all map to tp_richcompare) and one name may map to multiple slots (e.g. __str__ affects tp_str as well as tp_repr). The table is terminated with -an all-zero entry. (This table is further initialized in init_slotdefs().) +an all-zero entry. (This table is further initialized in +_PyTypes_InitSlotDefs().) */ typedef struct wrapperbase slotdef; @@ -7423,28 +7425,29 @@ update_slots_callback(PyTypeObject *type, void *data) static int slotdefs_initialized = 0; /* Initialize the slotdefs table by adding interned string objects for the names. */ -static void -init_slotdefs(void) +PyStatus +_PyTypes_InitSlotDefs(void) { - slotdef *p; + if (slotdefs_initialized) { + return _PyStatus_OK(); + } - if (slotdefs_initialized) - return; - for (p = slotdefs; p->name; p++) { + for (slotdef *p = slotdefs; p->name; p++) { /* Slots must be ordered by their offset in the PyHeapTypeObject. */ assert(!p[1].name || p->offset <= p[1].offset); p->name_strobj = PyUnicode_InternFromString(p->name); - if (!p->name_strobj || !PyUnicode_CHECK_INTERNED(p->name_strobj)) - Py_FatalError("Out of memory interning slotdef names"); + if (!p->name_strobj || !PyUnicode_CHECK_INTERNED(p->name_strobj)) { + return _PyStatus_NO_MEMORY(); + } } slotdefs_initialized = 1; + return _PyStatus_OK(); } -/* Undo init_slotdefs, releasing the interned strings. */ +/* Undo _PyTypes_InitSlotDefs(), releasing the interned strings. */ static void clear_slotdefs(void) { - slotdef *p; - for (p = slotdefs; p->name; p++) { + for (slotdef *p = slotdefs; p->name; p++) { Py_CLEAR(p->name_strobj); } slotdefs_initialized = 0; @@ -7462,7 +7465,7 @@ update_slot(PyTypeObject *type, PyObject *name) assert(PyUnicode_CheckExact(name)); assert(PyUnicode_CHECK_INTERNED(name)); - init_slotdefs(); + assert(slotdefs_initialized); pp = ptrs; for (p = slotdefs; p->name; p++) { if (p->name_strobj == name) @@ -7490,7 +7493,7 @@ fixup_slot_dispatchers(PyTypeObject *type) { slotdef *p; - init_slotdefs(); + assert(slotdefs_initialized); for (p = slotdefs; p->name; ) p = update_one_slot(type, p); } @@ -7503,7 +7506,7 @@ update_all_slots(PyTypeObject* type) /* Clear the VALID_VERSION flag of 'type' and all its subclasses. */ PyType_Modified(type); - init_slotdefs(); + assert(slotdefs_initialized); for (p = slotdefs; p->name; p++) { /* update_slot returns int but can't actually fail */ update_slot(type, p->name_strobj); @@ -7663,7 +7666,7 @@ add_operators(PyTypeObject *type) PyObject *descr; void **ptr; - init_slotdefs(); + assert(slotdefs_initialized); for (p = slotdefs; p->name; p++) { if (p->wrapper == NULL) continue; [View Less]

1 0

bpo-38631: Replace Py_FatalError() with _PyObject_ASSERT_FAILED_MSG() (GH-18258)
by Victor Stinner Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/5eb8bff7e4aa7e4d8580a30323641388c8… commit: 5eb8bff7e4aa7e4d8580a30323641388c8ff59a5 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-30T09:01:07+01:00 summary: bpo-38631: Replace Py_FatalError() with _PyObject_ASSERT_FAILED_MSG() (GH-18258) Replace Py_FatalError() with _PyObject_ASSERT_FAILED_MSG() in object.c and typeobject.c to also dump the involved Python object on a … [View More]fatal error. It should ease debug when such fatal error occurs. If the double linked list is inconsistent, _Py_ForgetReference() no longer dumps previous and next objects in the fatal error, it now only dumps the current object. It ensures that the error message is displayed even if dumping the object does crash Python. Enhance _Py_ForgetReference() error messages; _PyObject_ASSERT_FAILED_MSG() logs the "_Py_ForgetReference" function name. files: M Objects/object.c M Objects/typeobject.c diff --git a/Objects/object.c b/Objects/object.c index 14533dba16d64..aa84114c55471 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -315,30 +315,30 @@ PyObject_CallFinalizer(PyObject *self) int PyObject_CallFinalizerFromDealloc(PyObject *self) { - Py_ssize_t refcnt; - - /* Temporarily resurrect the object. */ if (self->ob_refcnt != 0) { - Py_FatalError("PyObject_CallFinalizerFromDealloc called on " - "object with a non-zero refcount"); + _PyObject_ASSERT_FAILED_MSG(self, + "PyObject_CallFinalizerFromDealloc called " + "on object with a non-zero refcount"); } + + /* Temporarily resurrect the object. */ self->ob_refcnt = 1; PyObject_CallFinalizer(self); - /* Undo the temporary resurrection; can't use DECREF here, it would - * cause a recursive call. - */ _PyObject_ASSERT_WITH_MSG(self, self->ob_refcnt > 0, "refcount is too small"); - if (--self->ob_refcnt == 0) + + /* Undo the temporary resurrection; can't use DECREF here, it would + * cause a recursive call. */ + if (--self->ob_refcnt == 0) { return 0; /* this is the normal path out */ + } /* tp_finalize resurrected it! Make it look like the original Py_DECREF - * never happened. - */ - refcnt = self->ob_refcnt; + * never happened. */ + Py_ssize_t refcnt = self->ob_refcnt; _Py_NewReference(self); self->ob_refcnt = refcnt; @@ -352,8 +352,7 @@ PyObject_CallFinalizerFromDealloc(PyObject *self) * chain, so no more to do there. * If COUNT_ALLOCS, the original decref bumped tp_frees, and * _Py_NewReference bumped tp_allocs: both of those need to be - * undone. - */ + * undone. */ #ifdef COUNT_ALLOCS --Py_TYPE(self)->tp_frees; --Py_TYPE(self)->tp_allocs; @@ -1938,29 +1937,30 @@ _Py_NewReference(PyObject *op) void _Py_ForgetReference(PyObject *op) { -#ifdef SLOW_UNREF_CHECK - PyObject *p; -#endif - if (op->ob_refcnt < 0) - Py_FatalError("UNREF negative refcnt"); + if (op->ob_refcnt < 0) { + _PyObject_ASSERT_FAILED_MSG(op, "negative refcnt"); + } + if (op == &refchain || - op->_ob_prev->_ob_next != op || op->_ob_next->_ob_prev != op) { - fprintf(stderr, "* ob\n"); - _PyObject_Dump(op); - fprintf(stderr, "* op->_ob_prev->_ob_next\n"); - _PyObject_Dump(op->_ob_prev->_ob_next); - fprintf(stderr, "* op->_ob_next->_ob_prev\n"); - _PyObject_Dump(op->_ob_next->_ob_prev); - Py_FatalError("UNREF invalid object"); + op->_ob_prev->_ob_next != op || op->_ob_next->_ob_prev != op) + { + _PyObject_ASSERT_FAILED_MSG(op, "invalid object chain"); } + #ifdef SLOW_UNREF_CHECK + PyObject *p; for (p = refchain._ob_next; p != &refchain; p = p->_ob_next) { - if (p == op) + if (p == op) { break; + } + } + if (p == &refchain) { + /* Not found */ + _PyObject_ASSERT_FAILED_MSG(op, + "object not found in the objects list"); } - if (p == &refchain) /* Not found */ - Py_FatalError("UNREF unknown object"); #endif + op->_ob_next->_ob_prev = op->_ob_prev; op->_ob_prev->_ob_next = op->_ob_next; op->_ob_next = op->_ob_prev = NULL; diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 720363410ceb1..5773eb7096e0c 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3570,9 +3570,9 @@ type_traverse(PyTypeObject *type, visitproc visit, void *arg) for heaptypes. */ if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) { char msg[200]; - sprintf(msg, "type_traverse() called for non-heap type '%.100s'", + sprintf(msg, "type_traverse() called on non-heap type '%.100s'", type->tp_name); - Py_FatalError(msg); + _PyObject_ASSERT_FAILED_MSG((PyObject *)type, msg); } Py_VISIT(type->tp_dict); [View Less]

1 0

[3.8] bpo-39401: Avoid unsafe DLL load on Windows 7 and earlier (GH-18231) (GH-18234)
by Steve Dower Jan. 30, 2020

Jan. 30, 2020

https://github.com/python/cpython/commit/ad4a20b87d79a619ffbdea3f2684878089… commit: ad4a20b87d79a619ffbdea3f26848780899494e5 branch: 3.8 author: Steve Dower <steve.dower(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-01-29T22:18:25-08:00 summary: [3.8] bpo-39401: Avoid unsafe DLL load on Windows 7 and earlier (GH-18231) (GH-18234) https://bugs.python.org/issue39401 Automerge-Triggered-By: @zooba files: A Misc/NEWS.d/next/Security/2020-01-28-20-54-09.bpo-… [View More]

1 0