H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dbms): escape TDB names in response

Browse Source
This commit is contained in:
Masahiko AMANO 2023-01-30 20:23:39 +03:00
parent e9c0c6340a
commit 5a78facf76
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tdbms/server/tdbms-server.c
View File

@ -350,16 +350,18 @@ int execute(char *request, char **response) {
buffer = malloc(BUFSIZ); buffer = malloc(BUFSIZ);
TDB *temp = db_list; TDB *temp = db_list;
for (uint16_t i = 0; i < db_count; i++, temp++) { for (uint16_t i = 0; i < db_count; i++, temp++) {
char *escaped_name = escape(temp->name);
if (temp->database == NULL) { if (temp->database == NULL) {
sprintf(buffer, "{\"name\":\"%s\",\"loaded\":false},", temp->name); sprintf(buffer, "{\"name\":\"%s\",\"loaded\":false},", escaped_name);
} else { } else {
tanabata = temp->database; tanabata = temp->database;
sprintf(buffer, "{" sprintf(buffer, "{"
"\"loaded\":true,\"unsaved\":%s," "\"name\":\"%s\",\"loaded\":true,\"changed\":%s,"
"\"sasahyou_cts\":%lu,\"sasahyou_mts\":%lu,\"sasahyou_size\":%lu,\"sasahyou_holes\":%lu," "\"sasahyou_cts\":%lu,\"sasahyou_mts\":%lu,\"sasahyou_size\":%lu,\"sasahyou_holes\":%lu,"
"\"sappyou_cts\":%lu,\"sappyou_mts\":%lu,\"sappyou_size\":%lu,\"sappyou_holes\":%lu," "\"sappyou_cts\":%lu,\"sappyou_mts\":%lu,\"sappyou_size\":%lu,\"sappyou_holes\":%lu,"
"\"shoppyou_cts\":%lu,\"shoppyou_mts\":%lu,\"shoppyou_size\":%lu,\"shoppyou_holes\":%lu" "\"shoppyou_cts\":%lu,\"shoppyou_mts\":%lu,\"shoppyou_size\":%lu,\"shoppyou_holes\":%lu"
"},", "},",
escaped_name,
(tanabata->sasahyou_mod != tanabata->sasahyou.modified_ts || (tanabata->sasahyou_mod != tanabata->sasahyou.modified_ts ||
tanabata->sappyou_mod != tanabata->sappyou.modified_ts || tanabata->sappyou_mod != tanabata->sappyou.modified_ts ||
tanabata->shoppyou_mod != tanabata->shoppyou.modified_ts) ? "true" : "false", tanabata->shoppyou_mod != tanabata->shoppyou.modified_ts) ? "true" : "false",
@ -370,6 +372,7 @@ int execute(char *request, char **response) {
tanabata->shoppyou.created_ts, tanabata->shoppyou.modified_ts, tanabata->shoppyou.size, tanabata->shoppyou.created_ts, tanabata->shoppyou.modified_ts, tanabata->shoppyou.size,
tanabata->shoppyou.hole_cnt); tanabata->shoppyou.hole_cnt);
} }
free(escaped_name);
if (strlen(*response) + strlen(buffer) >= resp_size) { if (strlen(*response) + strlen(buffer) >= resp_size) {
resp_size += BUFSIZ; resp_size += BUFSIZ;
*response = realloc(*response, resp_size); *response = realloc(*response, resp_size);