mirror of
https://github.com/json-c/json-c.git
synced 2026-04-08 23:09:07 +08:00
Cap string length at INT_MAX.
Several issues occur if a string is longer than INT_MAX: - The function json_object_get_string_len returns the length of a string as int. If the string is longer than INT_MAX, the result would be negative. - That in turn would lead to possible out of boundary access when comparing these strings with memcmp and the returned length as done in json_object_equal. - If json_escape_str is called with such strings, out of boundary accesses can occur due to internal int handling (also fixed). - The string cannot be printed out due to printbuffer limits at INT_MAX (which is still true after this commit). Such huge strings can only be inserted through API calls at this point because input files are capped at INT_MAX anyway. Due to huge amount of RAM needed to reproduce these issues I have not added test cases.
This commit is contained in:
@@ -214,7 +214,7 @@ static inline const char *get_string_component(const struct json_object *jso)
|
|||||||
|
|
||||||
static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int flags)
|
static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int flags)
|
||||||
{
|
{
|
||||||
int pos = 0, start_offset = 0;
|
size_t pos = 0, start_offset = 0;
|
||||||
unsigned char c;
|
unsigned char c;
|
||||||
while (len--)
|
while (len--)
|
||||||
{
|
{
|
||||||
@@ -1329,9 +1329,10 @@ static int _json_object_set_string_len(json_object *jso, const char *s, size_t l
|
|||||||
if (jso == NULL || jso->o_type != json_type_string)
|
if (jso == NULL || jso->o_type != json_type_string)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (len >= SSIZE_T_MAX - 1)
|
if (len >= INT_MAX - 1)
|
||||||
// jso->len is a signed ssize_t, so it can't hold the
|
// jso->len is a signed ssize_t, so it can't hold the
|
||||||
// full size_t range.
|
// full size_t range. json_object_get_string_len returns
|
||||||
|
// length as int, cap length at INT_MAX.
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
dstbuf = get_string_component_mutable(jso);
|
dstbuf = get_string_component_mutable(jso);
|
||||||
|
|||||||
Reference in New Issue
Block a user