[3.12] Fix Unicode encode_wstr_utf8() (python#127420) (python#127504)

picnixz · vstinner · web-flow · commit 9f0d6b71d677 · 2024-12-02T13:24:26.000+01:00
Fix Unicode encode_wstr_utf8() (python#127420) Raise RuntimeError instead of RuntimeWarning. Co-authored-by: Victor Stinner <vstinner@python.org>
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -15446,7 +15446,7 @@ encode_wstr_utf8(wchar_t *wstr, char **str, const char *name)
     int res;
     res = _Py_EncodeUTF8Ex(wstr, str, NULL, NULL, 1, _Py_ERROR_STRICT);
     if (res == -2) {
-        PyErr_Format(PyExc_RuntimeWarning, "cannot decode %s", name);
+        PyErr_Format(PyExc_RuntimeError, "cannot encode %s", name);
         return -1;
     }
     if (res < 0) {

Original file line number	Diff line number	Diff line change
`@@ -15446,7 +15446,7 @@ encode_wstr_utf8(wchar_t wstr, char str, const char name)`
`15446`	`15446`	`int res;`
`15447`	`15447`	`res = _Py_EncodeUTF8Ex(wstr, str, NULL, NULL, 1, _Py_ERROR_STRICT);`
`15448`	`15448`	`if (res == -2) {`
`15449`		`- PyErr_Format(PyExc_RuntimeWarning, "cannot decode %s", name);`
	`15449`	`+ PyErr_Format(PyExc_RuntimeError, "cannot encode %s", name);`
`15450`	`15450`	`return -1;`
`15451`	`15451`	`}`
`15452`	`15452`	`if (res < 0) {`