Skip to content

Fix for issue 775 #776

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

Merged
merged 8 commits into from
May 12, 2019
Merged

Fix for issue 775 #776

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2deed25
Fix for issue 775
Apr 11, 2019
ed30252
Spaces not tabs
Apr 11, 2019
eff6f5a
Two more tabs
Apr 11, 2019
fadc615
Fix typo
Apr 19, 2019
2d54c0e
Change integer overflow check to conform with spec
May 7, 2019
a2f3689
Older compilers don't allow declaring variables other than at the top of
May 7, 2019
fcf89fe
Fix tabs, also attempt work-around for compile time constant conditional
May 9, 2019
7a70d74
Use a #define to only check for integer overflow when it is actually
May 9, 2019
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
44 changes: 32 additions & 12 deletions src/unpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,20 +189,29 @@ static inline int template_callback_false(unpack_user* u, msgpack_object* o)

static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_object* o)
{
unsigned int size;
size_t size;
// Let's leverage the fact that sizeof(msgpack_object) is a compile time constant
// to check for int overflows.
// Note - while n is constrained to 32-bit, the product of n * sizeof(msgpack_object)
// might not be constrained to 4GB on 64-bit systems
#if SIZE_MAX == UINT_MAX
if (n > SIZE_MAX/sizeof(msgpack_object))
return MSGPACK_UNPACK_NOMEM_ERROR;
#endif

o->type = MSGPACK_OBJECT_ARRAY;
o->via.array.size = 0;
size = n*sizeof(msgpack_object);
if (size / sizeof(msgpack_object) != n) {
// integer overflow
return MSGPACK_UNPACK_NOMEM_ERROR;
}

size = n * sizeof(msgpack_object);

if (*u->z == NULL) {
*u->z = msgpack_zone_new(MSGPACK_ZONE_CHUNK_SIZE);
if(*u->z == NULL) {
return MSGPACK_UNPACK_NOMEM_ERROR;
}
}

// Unsure whether size = 0 should be an error, and if so, what to return
o->via.array.ptr = (msgpack_object*)msgpack_zone_malloc(*u->z, size);
if(o->via.array.ptr == NULL) { return MSGPACK_UNPACK_NOMEM_ERROR; }
return 0;
Expand All @@ -222,20 +231,31 @@ static inline int template_callback_array_item(unpack_user* u, msgpack_object* c

static inline int template_callback_map(unpack_user* u, unsigned int n, msgpack_object* o)
{
unsigned int size;
size_t size;
// Let's leverage the fact that sizeof(msgpack_object_kv) is a compile time constant
// to check for int overflows
// Note - while n is constrained to 32-bit, the product of n * sizeof(msgpack_object)
// might not be constrained to 4GB on 64-bit systems

// Note - this will always be false on 64-bit systems
#if SIZE_MAX == UINT_MAX
if (n > SIZE_MAX/sizeof(msgpack_object_kv))
return MSGPACK_UNPACK_NOMEM_ERROR;
#endif

o->type = MSGPACK_OBJECT_MAP;
o->via.map.size = 0;
size = n*sizeof(msgpack_object_kv);
if (size / sizeof(msgpack_object_kv) != n) {
// integer overflow
return MSGPACK_UNPACK_NOMEM_ERROR;
}

size = n * sizeof(msgpack_object_kv);

if (*u->z == NULL) {
*u->z = msgpack_zone_new(MSGPACK_ZONE_CHUNK_SIZE);
if(*u->z == NULL) {
return MSGPACK_UNPACK_NOMEM_ERROR;
}
}

// Should size = 0 be an error? If so, what error to return?
o->via.map.ptr = (msgpack_object_kv*)msgpack_zone_malloc(*u->z, size);
if(o->via.map.ptr == NULL) { return MSGPACK_UNPACK_NOMEM_ERROR; }
return 0;
Expand Down