diff options
author | Arun Raghavan <arun@arunraghavan.net> | 2016-05-31 16:10:09 +0530 |
---|---|---|
committer | Arun Raghavan <arun@arunraghavan.net> | 2016-06-01 18:13:55 +0530 |
commit | 7eea597bd3316dd6e06a77dc4f683501124369f4 (patch) | |
tree | 5c1756bdc5d4b245d7b3bfd0378346ef327729a5 | |
parent | e88abd113353b2e819efbd1b65f9cfab18c72e08 (diff) |
json: Correctly handle bad strings with missing closing quotes
Also add a test for this case.
Signed-off-by: Arun Raghavan <arun@arunraghavan.net>
-rw-r--r-- | src/pulse/json.c | 2 | ||||
-rw-r--r-- | src/tests/json-test.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/pulse/json.c b/src/pulse/json.c index 541bea930..a16d07a9e 100644 --- a/src/pulse/json.c +++ b/src/pulse/json.c @@ -122,7 +122,7 @@ static const char* parse_string(const char *str, pa_json_object *obj) { str++; /* Consume leading '"' */ - while (*str != '"') { + while (*str && *str != '"') { if (*str != '\\') { /* We don't accept non-ASCII, non-control characters */ if (*str < 0x20) { diff --git a/src/tests/json-test.c b/src/tests/json-test.c index 2e1ca6b92..7d273d70c 100644 --- a/src/tests/json-test.c +++ b/src/tests/json-test.c @@ -216,6 +216,18 @@ START_TEST(array_test) { } END_TEST +START_TEST(bad_test) { + unsigned int i; + const char *bad_parse[] = { + "\"" /* Quote not closed */, + }; + + for (i = 0; i < PA_ELEMENTSOF(bad_parse); i++) { + fail_unless(pa_json_parse(bad_parse[i]) == NULL); + } +} +END_TEST + int main(int argc, char *argv[]) { int failed = 0; Suite *s; @@ -231,6 +243,7 @@ int main(int argc, char *argv[]) { tcase_add_test(tc, bool_test); tcase_add_test(tc, object_test); tcase_add_test(tc, array_test); + tcase_add_test(tc, bad_test); suite_add_tcase(s, tc); sr = srunner_create(s); |