From c9758784eb321fb9771e0bc7205b296e4d658045 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 27 Nov 2017 16:57:07 +0100 Subject: bpo-27535: Fix memory leak with warnings ignore (#4489) The warnings module doesn't leak memory anymore in the hidden warnings registry for the "ignore" action of warnings filters. The warn_explicit() function doesn't add the warning key to the registry anymore for the "ignore" action. --- Python/_warnings.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Python/_warnings.c') diff --git a/Python/_warnings.c b/Python/_warnings.c index 27f5b813a7..29370369e2 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -528,16 +528,21 @@ warn_explicit(PyObject *category, PyObject *message, goto cleanup; } + if (_PyUnicode_EqualToASCIIString(action, "ignore")) { + goto return_none; + } + /* Store in the registry that we've been here, *except* when the action is "always". */ rc = 0; if (!_PyUnicode_EqualToASCIIString(action, "always")) { if (registry != NULL && registry != Py_None && - PyDict_SetItem(registry, key, Py_True) < 0) + PyDict_SetItem(registry, key, Py_True) < 0) + { goto cleanup; - else if (_PyUnicode_EqualToASCIIString(action, "ignore")) - goto return_none; - else if (_PyUnicode_EqualToASCIIString(action, "once")) { + } + + if (_PyUnicode_EqualToASCIIString(action, "once")) { if (registry == NULL || registry == Py_None) { registry = get_once_registry(); if (registry == NULL) -- cgit v1.2.1