aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnur Gündüz <ogunduz@gmail.com>2026-06-17 00:40:30 +0200
committerOnur Gündüz <ogunduz@gmail.com>2026-06-17 00:40:30 +0200
commit00e5cd9beac815c981561ed66a823153abc62cd3 (patch)
tree2d22fa3485860169257dabd780c5c3d9922d5c87
parent4018dc4777260714d68c1927296277352255454e (diff)
downloadffwd-00e5cd9beac815c981561ed66a823153abc62cd3.tar.gz
ffwd-00e5cd9beac815c981561ed66a823153abc62cd3.zip
server: fix JSON escaping in error response bodies
-rw-r--r--src/server_json.c17
-rw-r--r--tests/test_server.c31
2 files changed, 36 insertions, 12 deletions
diff --git a/src/server_json.c b/src/server_json.c
index dad1d3f..e84dd4b 100644
--- a/src/server_json.c
+++ b/src/server_json.c
@@ -19,18 +19,11 @@
* inclusion in a response. */
static void append_json_error(sbuf *b, const char *message, const char *type) {
- sbuf_puts(b, "{\"error\":{\"message\":\"");
- for (const char *p = message ? message : ""; *p; p++) {
- if (*p == '"' || *p == '\\') {
- sbuf_putc(b, '\\');
- sbuf_putc(b, *p);
- } else {
- sbuf_putc(b, *p);
- }
- }
- sbuf_puts(b, "\",\"type\":\"");
- sbuf_puts(b, type ? type : "server_error");
- sbuf_puts(b, "\"}}");
+ sbuf_puts(b, "{\"error\":{\"message\":");
+ append_json_string(b, message ? message : "");
+ sbuf_puts(b, ",\"type\":");
+ append_json_string(b, type ? type : "server_error");
+ sbuf_puts(b, "}}");
}
void append_json_string(sbuf *b, const char *s) {
diff --git a/tests/test_server.c b/tests/test_server.c
index 9c51940..6cc6e66 100644
--- a/tests/test_server.c
+++ b/tests/test_server.c
@@ -69,6 +69,36 @@ static void test_sbuf_growth_and_formatting(void) {
sbuf_free(&b);
}
+static void test_json_error_body_escaping(void) {
+ size_t len = 0;
+ char *body = json_error_body("line\nquote\" tab\t ctrl\001 slash\\", "bad\ntype", &len);
+ TEST_ASSERT(body != NULL);
+ if (!body)
+ return;
+ TEST_ASSERT(len == strlen(body));
+ TEST_ASSERT(strchr(body, '\n') == NULL);
+ TEST_ASSERT(strchr(body, '\t') == NULL);
+ cJSON *root = cJSON_Parse(body);
+ TEST_ASSERT(root != NULL);
+ if (!root) {
+ free(body);
+ return;
+ }
+ cJSON *err = cJSON_GetObjectItemCaseSensitive(root, "error");
+ cJSON *msg = err ? cJSON_GetObjectItemCaseSensitive(err, "message") : NULL;
+ cJSON *type = err ? cJSON_GetObjectItemCaseSensitive(err, "type") : NULL;
+ if (!msg || !type || !cJSON_IsString(msg) || !cJSON_IsString(type)) {
+ TEST_ASSERT(0 && "error body fields must be strings");
+ cJSON_Delete(root);
+ free(body);
+ return;
+ }
+ TEST_ASSERT(strcmp(msg->valuestring, "line\nquote\" tab\t ctrl\001 slash\\") == 0);
+ TEST_ASSERT(strcmp(type->valuestring, "bad\ntype") == 0);
+ cJSON_Delete(root);
+ free(body);
+}
+
static void test_quantize_int8_tanh(void) {
TEST_ASSERT(quantize_int8_tanh(0.0f) == 0);
/* tanh saturates to +-1, scaled by 127. */
@@ -1075,6 +1105,7 @@ static void test_http_server(void) {
int main(void) {
test_base64_rfc4648();
test_sbuf_growth_and_formatting();
+ test_json_error_body_escaping();
test_quantize_int8_tanh();
test_encode_embedding_int8();
test_encode_embedding_binary();