mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-09 18:48:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-124248: Fix crash in struct when processing 0p fields (#124251)

Browse source
This commit is contained in:
Brian Schubert 2024-09-20 06:08:59 -04:00 • committed by GitHub
parent baa3550bc3
commit 63f196090f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Modules/_struct.c
View file

@ -1669,9 +1669,16 @@ s_unpack_internal(PyStructObject *soself, const char *startfrom,
if (e->format == 's') {
v = PyBytes_FromStringAndSize(res, code->size);
} else if (e->format == 'p') {
Py_ssize_t n = *(unsigned char*)res;
if (n >= code->size)
n = code->size - 1;
Py_ssize_t n;
if (code->size == 0) {
n = 0;
}
else {
n = *(unsigned char*)res;
if (n >= code->size) {
n = code->size - 1;
}
}
v = PyBytes_FromStringAndSize(res + 1, n);
} else {
v = e->unpack(state, res, e);
@ -1982,8 +1989,12 @@ s_pack_internal(PyStructObject *soself, PyObject *const *args, int offset,
n = PyByteArray_GET_SIZE(v);
p = PyByteArray_AS_STRING(v);
}
if (n > (code->size - 1))
if (code->size == 0) {
n = 0;
}
else if (n > (code->size - 1)) {
n = code->size - 1;
}
if (n > 0)
memcpy(res + 1, p, n);
if (n > 255)