aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

json: make json_add_string do partial escapes.

Browse Source 
This is useful when we log a JSON-escaped string, so we don't double-escape.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-26 10:38:47 +10:30
parent ed9093fcbd
commit 7ae013202f
7 changed files with 87 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/json.c
View File

@@ -409,18 +409,11 @@ void json_add_literal(struct json_result *result, const char *fieldname,
void json_add_string(struct json_result *result, const char *fieldname, const char *value)
{
char *escaped = tal_strdup(result, value);
size_t i;
struct json_escaped *esc = json_partial_escape(NULL, value);
json_start_member(result, fieldname);
for (i = 0; escaped[i]; i++) {
/* Replace any funny business. Better safe than accurate! */
if (escaped[i] == '\\'
|| escaped[i] == '"'
|| !cisprint(escaped[i]))
escaped[i] = '?';
}
result_append_fmt(result, "\"%s\"", escaped);
result_append_fmt(result, "\"%s\"", esc->s);
tal_free(esc);
}
void json_add_bool(struct json_result *result, const char *fieldname, bool value)