diff options
| author | Arun Raghavan <arun@arunraghavan.net> | 2016-06-01 17:18:34 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2016-06-22 21:04:47 +0530 |
| commit | 777a5091f613d1a2cf67248e33da3a8961ab9bbb (patch) | |
| tree | b13b834c95cf22e4bdb49f3d70972663ba530feb /src | |
| parent | 708b4aac91ce8220480df6a34ccb491be2b8d490 (diff) | |
json: Add overflow checks for integer and float parsing
Signed-off-by: Arun Raghavan <arun@arunraghavan.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pulse/json.c | 18 | ||||
| -rw-r--r-- | src/tests/json-test.c | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/pulse/json.c b/src/pulse/json.c index 6297902cb..d77c7adcd 100644 --- a/src/pulse/json.c +++ b/src/pulse/json.c @@ -211,6 +211,11 @@ static const char* parse_number(const char *str, pa_json_object *obj) { } while (is_digit(*str)) { + if (integer > ((negative ? INT_MAX : UINT_MAX) / 10)) { + pa_log("Integer overflow while parsing number"); + goto error; + } + integer = (integer * 10) + (*str - '0'); str++; } @@ -221,6 +226,11 @@ fraction: str++; while (is_digit(*str)) { + if (fraction > (UINT_MAX / 10)) { + pa_log("Integer overflow while parsing fractional part of number"); + goto error; + } + fraction = (fraction * 10) + (*str - '0'); fraction_digits++; str++; @@ -240,6 +250,11 @@ fraction: str++; while (is_digit(*str)) { + if (exponent > (INT_MAX / 10)) { + pa_log("Integer overflow while parsing exponent part of number"); + goto error; + } + exponent = (exponent * 10) + (*str - '0'); str++; } @@ -258,6 +273,9 @@ fraction: } return str; + +error: + return NULL; } static const char *parse_object(const char *str, pa_json_object *obj) { diff --git a/src/tests/json-test.c b/src/tests/json-test.c index 7d273d70c..a5f1f74cc 100644 --- a/src/tests/json-test.c +++ b/src/tests/json-test.c @@ -220,6 +220,9 @@ START_TEST(bad_test) { unsigned int i; const char *bad_parse[] = { "\"" /* Quote not closed */, + "123456789012345678901234567890" /* Overflow */, + "0.123456789012345678901234567890" /* Overflow */, + "1e123456789012345678901234567890" /* Overflow */, }; for (i = 0; i < PA_ELEMENTSOF(bad_parse); i++) { |