summaryrefslogtreecommitdiff
path: root/json.c
diff options
context:
space:
mode:
authorpommicket <pommicket@gmail.com>2022-12-07 13:05:02 -0500
committerpommicket <pommicket@gmail.com>2022-12-07 13:05:02 -0500
commit65b72b38ec6c3a51b33e5d32313b51df993b32e4 (patch)
treee0805eb34d10dc0f90483f017f8ee80430bf61d9 /json.c
parent0c845d4308b7b255faf57f4e3bb95827e3cecc49 (diff)
nice communication with LSP
Diffstat (limited to 'json.c')
-rw-r--r--json.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/json.c b/json.c
index f514b4f..e63bc64 100644
--- a/json.c
+++ b/json.c
@@ -50,6 +50,7 @@ struct JSONValue {
typedef struct {
char error[64];
+ bool is_text_copied; // if this is true, then json_free will call free on text
const char *text;
// root = values[0]
JSONValue *values;
@@ -362,11 +363,13 @@ static bool json_parse(JSON *json, const char *text) {
arr_addp(json->values); // add root
JSONValue val = {0};
u32 index = 0;
- if (!json_parse_value(json, &index, &val))
+ if (!json_parse_value(json, &index, &val)) {
+ arr_free(json->values);
return false;
-
+ }
SKIP_WHITESPACE;
if (text[index]) {
+ arr_free(json->values);
strbuf_printf(json->error, "extra text after end of root object");
return false;
}
@@ -374,9 +377,25 @@ static bool json_parse(JSON *json, const char *text) {
return true;
}
+// like json_parse, but a copy of text is made, so you can free/overwrite it immediately.
+static bool json_parse_copy(JSON *json, const char *text) {
+ bool success = json_parse(json, str_dup(text));
+ if (success) {
+ json->is_text_copied = true;
+ return true;
+ } else {
+ free((void*)json->text);
+ json->text = NULL;
+ return false;
+ }
+}
+
static void json_free(JSON *json) {
arr_free(json->values);
memset(json, 0, sizeof *json);
+ if (json->is_text_copied) {
+ free((void*)json->text);
+ }
}
static bool json_streq(const JSON *json, const JSONString *string, const char *name) {