Revert "pythongh-111089: Use PyUnicode_AsUTF8() in getargs.c (python#…

…111620)" This reverts commit cde1071.
vstinner · Nov 7, 2023 · 938652f · 938652f
1 parent cba249d
commit 938652f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Python/getargs.c b/Python/getargs.c
@@ -932,15 +932,19 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
         } else {
             /* "s" or "z" */
             const char **p = va_arg(*p_va, const char **);
+            Py_ssize_t len;
             sarg = NULL;
 
             if (c == 'z' && arg == Py_None)
                 *p = NULL;
             else if (PyUnicode_Check(arg)) {
-                sarg = PyUnicode_AsUTF8(arg);
-                if (sarg == NULL) {
+                sarg = PyUnicode_AsUTF8AndSize(arg, &len);
+                if (sarg == NULL)
                     return converterr(CONV_UNICODE,
                                       arg, msgbuf, bufsize);
+                if (strlen(sarg) != (size_t)len) {
+                    PyErr_SetString(PyExc_ValueError, "embedded null character");
+                    RETURN_ERR_OCCURRED;
                 }
                 *p = sarg;
             }