FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #381 from phst/end-of-file-error-code

Browse Source 
Use a more specific error code for premature end of input
This commit is contained in:
Petri Lehtinen 2018-02-09 09:40:42 +02:00 committed by GitHub
commit 46dff2737d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/load.c
View File

@ -122,6 +122,10 @@ static void error_set(json_error_t *error, const lex_t *lex,
} }
else else
{ {
if(code == json_error_invalid_syntax) {
/* More specific error code for premature end of file. */
code = json_error_premature_end_of_input;
}
if(lex->stream.state == STREAM_STATE_ERROR) { if(lex->stream.state == STREAM_STATE_ERROR) {
/* No context for UTF-8 decoding errors */ /* No context for UTF-8 decoding errors */
result = msg_text; result = msg_text;

8
test/suites/api/test_load.c
View File

@ -221,6 +221,14 @@ static void error_code()
fail("error.text longer than expected"); fail("error.text longer than expected");
if(json_error_code(&error) != json_error_end_of_input_expected) if(json_error_code(&error) != json_error_end_of_input_expected)
fail("json_loads returned incorrect error code"); fail("json_loads returned incorrect error code");
json = json_loads("{\"foo\": ", 0, &error);
if(json != NULL)
fail("json_loads returned not NULL");
if(strlen(error.text) >= JSON_ERROR_TEXT_LENGTH)
fail("error.text longer than expected");
if(json_error_code(&error) != json_error_premature_end_of_input)
fail("json_loads returned incorrect error code");
} }
static void run_tests() static void run_tests()