Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Modules/pyexpat.c
Original file line number Diff line number Diff line change
Expand Up @@ -1452,8 +1452,9 @@ pyexpat_encoding_create(const char *name, PyObject *mapping)
"_expat_decoding_table must be a 256-tuple of integers");
return NULL;
}
size_t name_len = strlen(name) + 1;
pyexpat_encoding_info *info = (pyexpat_encoding_info *)PyMem_Malloc(
sizeof(pyexpat_encoding_info) + strlen(name) + 1);
sizeof(pyexpat_encoding_info) + name_len);
if (info == NULL) {
PyErr_NoMemory();
return NULL;
Expand All @@ -1466,7 +1467,7 @@ pyexpat_encoding_create(const char *name, PyObject *mapping)
}
info->map[i] = j;
}
strcpy(info->name, name);
memcpy(info->name, name, name_len);
return info;
}

Expand Down
12 changes: 12 additions & 0 deletions tests/test_invariant_pyexpat.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#include <check.h>
#include <stdlib.h>
#include <string.h>
#include <Python.h>
#include "Modules/pyexpat.c"

START_TEST(test_buffer_reads_never_exceed_declared_length)
{
// Invariant: Buffer reads never exceed the declared length
const char *payloads[] = {
"valid", // Valid input
"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
Loading