Skip to content

Fix segfault in TypeTreeHelper boost when reading past buffer end #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SNWCreations wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −4
Open

Fix segfault in TypeTreeHelper boost when reading past buffer end #374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 38 additions & 4 deletions UnityPyBoost/TypeTreeHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ typedef struct Reader
uint8_t *ptr;
uint8_t *end;
uint8_t *start;
bool exhausted;
} ReaderT;

typedef struct TypeTreeReaderConfig
Expand Down Expand Up @@ -75,6 +76,7 @@ inline PyObject *read_bool(ReaderT *reader)
{
if (reader->ptr + 1 > reader->end)
{
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_bool out of bounds");
return NULL;
}
Expand All @@ -87,7 +89,8 @@ inline PyObject *read_bool_array(ReaderT *reader, int32_t count)
{
if (reader->ptr + count > reader->end)
{
PyErr_SetString(PyExc_ValueError, "read_bool out of bounds");
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_bool_array out of bounds");
return NULL;
}
PyObject *list = PyList_New(count);
Expand All @@ -104,6 +107,7 @@ inline PyObject *read_u8(ReaderT *reader)
{
if (reader->ptr + 1 > reader->end)
{
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_u8 out of bounds");
return NULL;
}
Expand All @@ -114,7 +118,8 @@ inline PyObject *read_u8_array(ReaderT *reader, int32_t count)
{
if (reader->ptr + count > reader->end)
{
PyErr_SetString(PyExc_ValueError, "read_u8 out of bounds");
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_u8_array out of bounds");
return NULL;
}
PyObject *list = PyList_New(count);
Expand All @@ -129,6 +134,7 @@ inline PyObject *read_s8(ReaderT *reader)
{
if (reader->ptr + 1 > reader->end)
{
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_s8 out of bounds");
return NULL;
}
Expand All @@ -139,7 +145,8 @@ inline PyObject *read_s8_array(ReaderT *reader, int32_t count)
{
if (reader->ptr + count > reader->end)
{
PyErr_SetString(PyExc_ValueError, "read_s8 out of bounds");
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_s8_array out of bounds");
return NULL;
}
PyObject *list = PyList_New(count);
Expand All @@ -159,6 +166,7 @@ inline PyObject *read_num(ReaderT *reader)

if (reader->ptr + sizeof(T) > reader->end)
{
reader->exhausted = true;
return PyErr_Format(PyExc_ValueError, "read_%s out of bounds", typeid(T).name());
}
T value = *(T *)reader->ptr;
Expand Down Expand Up @@ -206,6 +214,7 @@ inline PyObject *read_num_array(ReaderT *reader, int32_t count)

if (reader->ptr + sizeof(T) * count > reader->end)
{
reader->exhausted = true;
return PyErr_Format(PyExc_ValueError, "read_%s_array out of bounds", typeid(T).name());
}
PyObject *list = PyList_New(count);
Expand Down Expand Up @@ -260,6 +269,7 @@ inline bool _read_length(ReaderT *reader, int32_t *length)
{
if (reader->ptr + sizeof(int32_t) > reader->end)
{
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_length out of bounds");
return false;
}
Expand Down Expand Up @@ -287,6 +297,7 @@ inline PyObject *read_str(ReaderT *reader)
}
if (reader->ptr + length > reader->end)
{
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_str out of bounds");
return NULL;
}
Expand All @@ -306,6 +317,7 @@ inline PyObject *read_bytes(ReaderT *reader)
}
if (reader->ptr + length > reader->end)
{
reader->exhausted = true;
PyErr_SetString(PyExc_ValueError, "read_bytes out of bounds");
return NULL;
}
Expand Down Expand Up @@ -355,6 +367,10 @@ inline PyObject *read_pair_array(ReaderT *reader, TypeTreeNodeObject *node, Type
TypeTreeNodeObject *second_child = (TypeTreeNodeObject *)PyList_GET_ITEM(node->m_Children, 1);

PyObject *list = PyList_New(count);
if (list == NULL)
{
return NULL;
}
for (auto i = 0; i < count; i++)
{
PyObject *first = read_typetree_value<swap>(reader, first_child, config);
Expand Down Expand Up @@ -689,6 +705,13 @@ const NodeDataType SUPPORTED_VALUE_ARRAY_READ_TYPES[] = {
template <bool swap>
PyObject *read_typetree_value(ReaderT *reader, TypeTreeNodeObject *node, TypeTreeReaderConfigT *config)
{
if (reader->exhausted)
{
if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError, "Read past end of typetree data");
return NULL;
}

bool align = node->_align;
PyObject *value = nullptr;

Expand Down Expand Up @@ -827,6 +850,10 @@ PyObject *read_typetree_value(ReaderT *reader, TypeTreeNodeObject *node, TypeTre
if (std::find(std::begin(SUPPORTED_VALUE_ARRAY_READ_TYPES), std::end(SUPPORTED_VALUE_ARRAY_READ_TYPES), child->_data_type) == std::end(SUPPORTED_VALUE_ARRAY_READ_TYPES))
{
value = PyList_New(length);
if (value == NULL)
{
return NULL;
}
for (int i = 0; i < length; i++)
{
PyObject *item = read_typetree_value<swap>(reader, child, config);
Expand Down Expand Up @@ -869,6 +896,13 @@ PyObject *read_typetree_value(ReaderT *reader, TypeTreeNodeObject *node, TypeTre
template <bool swap>
PyObject *read_typetree_value_array(ReaderT *reader, TypeTreeNodeObject *node, TypeTreeReaderConfigT *config, int32_t count)
{
if (reader->exhausted)
{
if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError, "Read past end of typetree data");
return NULL;
}

bool align = node->_align;
PyObject *value = nullptr;

Expand Down Expand Up @@ -1012,7 +1046,7 @@ PyObject *read_typetree(PyObject *self, PyObject *args, PyObject *kwargs)
}
}

reader = {static_cast<uint8_t *>(view.buf), static_cast<uint8_t *>(view.buf) + view.len, static_cast<uint8_t *>(view.buf)};
reader = {static_cast<uint8_t *>(view.buf), static_cast<uint8_t *>(view.buf) + view.len, static_cast<uint8_t *>(view.buf), false};

if (swap)
{
Expand Down