bpo-35714: Reject null characters in struct format strings (GH-16928)

struct.error is now raised if there is a null character in a struct
format string.
This commit is contained in:
Zackery Spytz 2020-05-25 01:55:09 -06:00 committed by GitHub
parent 372ee27d49
commit 3f59b55316
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions

View file

@ -1296,6 +1296,11 @@ prepare_s(PyStructObject *self)
size_t ncodes;
fmt = PyBytes_AS_STRING(self->s_format);
if (strlen(fmt) != (size_t)PyBytes_GET_SIZE(self->s_format)) {
PyErr_SetString(_structmodulestate_global->StructError,
"embedded null character");
return -1;
}
f = whichtable(&fmt);