mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
gh-111089: Use PyUnicode_AsUTF8() in Argument Clinic (#111585)
Replace PyUnicode_AsUTF8AndSize() with PyUnicode_AsUTF8() to remove the explicit check for embedded null characters. The change avoids to have to include explicitly <string.h> to get the strlen() function when using a recent version of the limited C API.
This commit is contained in:
parent
97b3cd38d1
commit
d9b606b3d0
34 changed files with 180 additions and 907 deletions
9
Python/clinic/sysmodule.c.h
generated
9
Python/clinic/sysmodule.c.h
generated
|
@ -1259,15 +1259,10 @@ sys_activate_stack_trampoline(PyObject *module, PyObject *arg)
|
|||
_PyArg_BadArgument("activate_stack_trampoline", "argument", "str", arg);
|
||||
goto exit;
|
||||
}
|
||||
Py_ssize_t backend_length;
|
||||
backend = PyUnicode_AsUTF8AndSize(arg, &backend_length);
|
||||
backend = PyUnicode_AsUTF8(arg);
|
||||
if (backend == NULL) {
|
||||
goto exit;
|
||||
}
|
||||
if (strlen(backend) != (size_t)backend_length) {
|
||||
PyErr_SetString(PyExc_ValueError, "embedded null character");
|
||||
goto exit;
|
||||
}
|
||||
return_value = sys_activate_stack_trampoline_impl(module, backend);
|
||||
|
||||
exit:
|
||||
|
@ -1452,4 +1447,4 @@ exit:
|
|||
#ifndef SYS_GETANDROIDAPILEVEL_METHODDEF
|
||||
#define SYS_GETANDROIDAPILEVEL_METHODDEF
|
||||
#endif /* !defined(SYS_GETANDROIDAPILEVEL_METHODDEF) */
|
||||
/*[clinic end generated code: output=f36d45c829250775 input=a9049054013a1b77]*/
|
||||
/*[clinic end generated code: output=cdfb714878deeaf1 input=a9049054013a1b77]*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue