mirror/json-c
1
0 Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-11-05 21:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Propagate printbuf append failures in json_escape_str

Browse Source
This commit is contained in:
Manohar Paturi committed 2026-09-29 21:35:52 +05:30
1 parent 25895a587e
commit 353e643768
1 file changed
+33 -22
Download Patch File Download Diff File Expand all files Collapse all files
json_object.c
+33 -22
View File
@@ -211,24 +211,27 @@ static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int
} }
if (pos > start_offset) if (pos > start_offset)
printbuf_memappend(pb, str + start_offset, pos - start_offset); {
if (printbuf_memappend(pb, str + start_offset, pos - start_offset) < 0)
return -1;
}
if (c == '\b') {
printbuf_memappend(pb, "\\b", 2); const char *esc;
else if (c == '\n') switch (c)
printbuf_memappend(pb, "\\n", 2); {
else if (c == '\r') case '\b': esc = "\\b"; break;
printbuf_memappend(pb, "\\r", 2); case '\n': esc = "\\n"; break;
else if (c == '\t') case '\r': esc = "\\r"; break;
printbuf_memappend(pb, "\\t", 2); case '\t': esc = "\\t"; break;
else if (c == '\f') case '\f': esc = "\\f"; break;
printbuf_memappend(pb, "\\f", 2); case '"': esc = "\\\""; break;
else if (c == '"') case '\\': esc = "\\\\"; break;
printbuf_memappend(pb, "\\\"", 2); default: esc = "\\/"; break;
else if (c == '\\') }
printbuf_memappend(pb, "\\\\", 2); if (printbuf_memappend(pb, esc, 2) < 0)
else if (c == '/') return -1;
printbuf_memappend(pb, "\\/", 2); }
start_offset = ++pos; start_offset = ++pos;
break; break;
@@ -237,11 +240,15 @@ static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int
{ {
char sbuf[7]; char sbuf[7];
if (pos > start_offset) if (pos > start_offset)
printbuf_memappend(pb, str + start_offset, {
pos - start_offset); if (printbuf_memappend(pb, str + start_offset,
pos - start_offset) < 0)
return -1;
}
snprintf(sbuf, sizeof(sbuf), "\\u00%c%c", json_hex_chars[c >> 4], snprintf(sbuf, sizeof(sbuf), "\\u00%c%c", json_hex_chars[c >> 4],
json_hex_chars[c & 0xf]); json_hex_chars[c & 0xf]);
printbuf_memappend_fast(pb, sbuf, (int)sizeof(sbuf) - 1); if (printbuf_memappend(pb, sbuf, (int)sizeof(sbuf) - 1) < 0)
return -1;
start_offset = ++pos; start_offset = ++pos;
} }
else else
@@ -249,7 +256,10 @@ static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int
} }
} }
if (pos > start_offset) if (pos > start_offset)
printbuf_memappend(pb, str + start_offset, pos - start_offset); {
if (printbuf_memappend(pb, str + start_offset, pos - start_offset) < 0)
return -1;
}
return 0; return 0;
} }
@@ -1517,7 +1527,8 @@ static int json_object_string_to_json_string(struct json_object *jso, struct pri
if (flags & JSON_C_TO_STRING_COLOR) if (flags & JSON_C_TO_STRING_COLOR)
printbuf_strappend(pb, ANSI_COLOR_FG_GREEN); printbuf_strappend(pb, ANSI_COLOR_FG_GREEN);
printbuf_strappend(pb, "\""); printbuf_strappend(pb, "\"");
json_escape_str(pb, get_string_component(jso), len < 0 ? -(ssize_t)len : len, flags); if (json_escape_str(pb, get_string_component(jso), len < 0 ? -(ssize_t)len : len, flags) < 0)
return -1;
printbuf_strappend(pb, "\""); printbuf_strappend(pb, "\"");
if (flags & JSON_C_TO_STRING_COLOR) if (flags & JSON_C_TO_STRING_COLOR)
printbuf_strappend(pb, ANSI_COLOR_RESET); printbuf_strappend(pb, ANSI_COLOR_RESET);