generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-17 03:03:24 +02:00
Code Issues Projects Releases Wiki Activity

Use a #define to only check for integer overflow when it is actually

Browse Source 
possible
This commit is contained in:
David LeBlanc
2019-05-08 18:49:55 -07:00
parent fcf89fe901
commit 7a70d74971
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/unpack.c
View File

@@ -194,8 +194,10 @@ static inline int template_callback_array(unpack_user* u, unsigned int n, msgpac
// 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_t)n > SIZE_MAX/sizeof(msgpack_object))
#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;
@@ -236,8 +238,10 @@ static inline int template_callback_map(unpack_user* u, unsigned int n, msgpack_
// might not be constrained to 4GB on 64-bit systems
// Note - this will always be false on 64-bit systems
if((size_t)n > SIZE_MAX/sizeof(msgpack_object_kv))
#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;