commit 5221a10dde4a3853fe7ace316d95767648055109
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Tue May 26 00:04:59 2020 -0700
committer GitHub <noreply@github.com> Tue May 26 00:04:59 2020 -0700
tree 502c4fee95ca0c75364abd0ba40da7aa4571cb76
parent a729f4abb8a3b13b63d46c450faf64202751449b

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.
(cherry picked from commit 3f59b55316f4c6ab451997902579aa69020b537c)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>

Modules/_struct.c

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 13d8072..5984bb6 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1296,6 +1296,11 @@
     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);