diff options
| author |  Nikias Bassen | 2022-04-06 01:06:30 +0200 |
|---|---|---|
| committer | Nikias Bassen | 2022-04-06 01:10:08 +0200 |
| commit | db93bae96d64140230ad050061632531644c46ad (patch) | |
| tree | 165f690d141b87a4b6871859f140136a4bdebf0a | |
| parent | d25e919f29078127b0305f88cdcbc33a798c5d90 (diff) | |
| download | libplist-db93bae96d64140230ad050061632531644c46ad.tar.gz libplist-db93bae96d64140230ad050061632531644c46ad.tar.bz2 | |
jplist: Escape characters [0x00..0x1F] when converting to JSON
| -rw-r--r-- | src/jplist.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/jplist.c b/src/jplist.c index 45f0544..6a44f8c 100644 --- a/src/jplist.c +++ b/src/jplist.c @@ -151,6 +151,12 @@ static int node_to_json(node_t* node, bytearray_t **outbuf, uint32_t depth, int case PLIST_STRING: case PLIST_KEY: { + const char *charmap[32] = { + "\\u0000", "\\u0001", "\\u0002", "\\u0003", "\\u0004", "\\u0005", "\\u0006", "\\u0007", + "\\b", "\\t", "\\n", "\\u000b", "\\f", "\\r", "\\u000e", "\\u000f", + "\\u0010", "\\u0011", "\\u0012", "\\u0013", "\\u0014", "\\u0015", "\\u0016", "\\u0017", + "\\u0018", "\\u0019", "\\u001a", "\\u001b", "\\u001c", "\\u001d", "\\u001e", "\\u001f", + }; size_t j = 0; size_t len = 0; off_t start = 0; @@ -160,14 +166,15 @@ static int node_to_json(node_t* node, bytearray_t **outbuf, uint32_t depth, int len = node_data->length; for (j = 0; j < len; j++) { - switch (node_data->strval[j]) { - case '"': + unsigned char ch = (unsigned char)node_data->strval[j]; + if (ch < 0x20) { + str_buf_append(*outbuf, node_data->strval + start, cur - start); + str_buf_append(*outbuf, charmap[ch], (charmap[ch][1] == 'u') ? 6 : 2); + start = cur+1; + } else if (ch == '"') { str_buf_append(*outbuf, node_data->strval + start, cur - start); str_buf_append(*outbuf, "\\\"", 2); start = cur+1; - break; - default: - break; } cur++; } |