bpo-34523, bpo-35322: Fix unicode_encode_locale() (GH-10759) (GH-10761)
Fix memory leak in PyUnicode_EncodeLocale() and
PyUnicode_EncodeFSDefault() on error handling.
Fix unicode_encode_locale() error handling.
(cherry picked from commit bde9d6bbb46ca59bcee5d5060adaa33c3ffee3a6)
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index e6371d2..bd3f151 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3391,10 +3391,9 @@
return NULL;
}
- Py_ssize_t wlen2 = wcslen(wstr);
- if (wlen2 != wlen) {
- PyMem_Free(wstr);
+ if ((size_t)wlen != wcslen(wstr)) {
PyErr_SetString(PyExc_ValueError, "embedded null character");
+ PyMem_Free(wstr);
return NULL;
}
@@ -3403,6 +3402,8 @@
const char *reason;
int res = _Py_EncodeLocaleEx(wstr, &str, &error_pos, &reason,
current_locale, surrogateescape);
+ PyMem_Free(wstr);
+
if (res != 0) {
if (res == -2) {
PyObject *exc;
@@ -3415,15 +3416,12 @@
PyCodec_StrictErrors(exc);
Py_DECREF(exc);
}
- return NULL;
}
else {
PyErr_NoMemory();
- PyMem_Free(wstr);
- return NULL;
}
+ return NULL;
}
- PyMem_Free(wstr);
PyObject *bytes = PyBytes_FromString(str);
PyMem_RawFree(str);