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

Add JSON_ALLOW_NUL decoding flag for enabling NUL byte support

Browse Source
This commit is contained in:
Petri Lehtinen
2013-09-30 10:44:35 +03:00
parent 5744468c99
commit 1bfc33362e
7 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/jansson.h
View File

@@ -244,6 +244,7 @@ json_t *json_deep_copy(const json_t *value);
#define JSON_DISABLE_EOF_CHECK 0x2
#define JSON_DECODE_ANY 0x4
#define JSON_DECODE_INT_AS_REAL 0x8
#define JSON_ALLOW_NUL 0x10
typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);

12
src/load.c
View File

@@ -802,7 +802,17 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
switch(lex->token) {
case TOKEN_STRING: {
json = jsonp_stringn_nocheck_own(lex->value.string.val, lex->value.string.len);
const char *value = lex->value.string.val;
size_t len = lex->value.string.len;
if(!(flags & JSON_ALLOW_NUL)) {
if(memchr(value, '\0', len)) {
error_set(error, lex, "\\u0000 is not allowed without JSON_ALLOW_NUL");
return NULL;
}
}
json = jsonp_stringn_nocheck_own(value, len);
if(json) {
lex->value.string.val = NULL;
lex->value.string.len = 0;