interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow keys without quotes in json dicts

This commit is contained in:
Willem Toorop 2016-05-31 15:02:17 +02:00
parent 2bb254c898
commit 6781899247
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/getdns_query.c
View File

@ -1032,20 +1032,13 @@ static int _jsmn_get_dict(char *js, jsmntok_t *t, size_t count,
/* Happend when primitives are used as keys */ /* Happend when primitives are used as keys */
break; break;
if (t[j].type != JSMN_STRING if (t[j].type != JSMN_STRING &&
#if 0 t[j].type != JSMN_PRIMITIVE) {
&& t[j].type != JSMN_PRIMITIVE
#endif
) {
*r = GETDNS_RETURN_WRONG_TYPE_REQUESTED; *r = GETDNS_RETURN_WRONG_TYPE_REQUESTED;
getdns_dict_destroy(new_dict); getdns_dict_destroy(new_dict);
return 0; return 0;
} }
key = js + t[j].start; key = js + t[j].start;
if (t[j].type== JSMN_PRIMITIVE) {
js[t[j].end - 1] = '\0';
i++;
} else
js[t[j].end] = '\0'; js[t[j].end] = '\0';
j += 1; j += 1;
switch (t[j].type) { switch (t[j].type) {

2
src/test/jsmn

@ -1 +1 @@
Subproject commit 7f9f06a8b23d22723c03a85465b15059ff4bd626 Subproject commit daa17063c67f0dfe873af25ab6b664641c8cf90c