Cleanup locale.localeconv(): move Py_DECREF() closer to the error

06587a0a · Victor Stinner · d305e3be · 06587a0a
Commit 06587a0a authored Oct 29, 2013 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Modules/_localemodule.c Modules/_localemodule.c +3 -2

No files found.
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -151,8 +151,10 @@ PyLocale_localeconv(PyObject* self)
    do { \
        if (obj == NULL) \
            goto failed; \
-        if (PyDict_SetItemString(result, key, obj) < 0) \
+        if (PyDict_SetItemString(result, key, obj) < 0) { \
+            Py_DECREF(obj); \
            goto failed; \
+        } \
        Py_DECREF(obj); \
    } while (0)

@@ -196,7 +198,6 @@ PyLocale_localeconv(PyObject* self)

  failed:
    Py_XDECREF(result);
-    Py_XDECREF(x);
    return NULL;
 }