summaryrefslogtreecommitdiff
path: root/lsp-json.c
diff options
context:
space:
mode:
authorpommicket <pommicket@gmail.com>2023-01-04 13:09:18 -0500
committerpommicket <pommicket@gmail.com>2023-01-04 13:09:18 -0500
commit7d4f4b04d642a8e454a773cde0a00be11fe624cf (patch)
tree933c21b0e7bb9c18dec414985f03138f98bd901c /lsp-json.c
parent4293f5284971473afaa43b83075d4d985b976622 (diff)
remove support for "extended json"
Diffstat (limited to 'lsp-json.c')
-rw-r--r--lsp-json.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lsp-json.c b/lsp-json.c
index 94bb556..08f926a 100644
--- a/lsp-json.c
+++ b/lsp-json.c
@@ -1,6 +1,5 @@
// JSON parser for LSP
// provides FAST(ish) parsing but SLOW lookup for large objects
-// this actually supports "extended json", where objects can have arbitrary values as keys.
#define LSP_INTERNAL 1
#include "lsp.h"
@@ -182,6 +181,10 @@ static bool json_parse_object(JSON *json, u32 *p_index, JSONObject *object) {
JSONValue name = {0}, value = {0};
if (!json_parse_value(json, &index, &name))
return false;
+ if (name.type != JSON_STRING) {
+ strbuf_printf(json->error, "object key is not a string");
+ return false;
+ }
SKIP_WHITESPACE;
if (text[index] != ':') {
strbuf_printf(json->error, "stuff after name in object");
@@ -396,7 +399,8 @@ JSONValue json_object_get(const JSON *json, JSONObject object, const char *name)
const JSONValue *items = &json->values[object.items];
for (u32 i = 0; i < object.len; ++i) {
const JSONValue *this_name = items++;
- if (this_name->type == JSON_STRING && json_streq(json, &this_name->val.string, name)) {
+ assert(this_name->type == JSON_STRING);
+ if (json_streq(json, &this_name->val.string, name)) {
return json->values[object.items + object.len + i];
}
}