From: Victor Stinner <vstinner@python.org>
Date: Wed, 1 Nov 2023 23:13:55 +0000 (+0100)
Subject: gh-111089: Use PyUnicode_AsUTF8() in getargs.c (#111620)
X-Git-Tag: v3.13.0a2~231
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cde1071b2a72e8261ca66053ef61431b7f3a81fd;p=thirdparty%2FPython%2Fcpython.git

gh-111089: Use PyUnicode_AsUTF8() in getargs.c (#111620)

Replace PyUnicode_AsUTF8AndSize() with PyUnicode_AsUTF8() to remove
the explicit check for embedded null characters.
---

diff --git a/Python/getargs.c b/Python/getargs.c
index 5a12ca8def74..4d91818ad21a 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -932,19 +932,15 @@ 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_AsUTF8AndSize(arg, &len);
-                if (sarg == NULL)
+                sarg = PyUnicode_AsUTF8(arg);
+                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;
             }