From 1f47d1276217474d553d8b65dd64ac72f92f8a3e Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 17:54:12 +0200 Subject: [src] Fixed angled bracket includes to quote includes where applicable --- src/browser-cli.h | 2 +- src/server-cli.c | 4 ++-- src/server-cli.h | 2 +- src/server-connection.c | 4 ++-- src/server-connection.h | 2 +- src/server.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/browser-cli.h b/src/browser-cli.h index a164dc9..8709231 100644 --- a/src/browser-cli.h +++ b/src/browser-cli.h @@ -1,7 +1,7 @@ #ifndef BROWSER_CLI #define BROWSER_CLI -#include +#include "sds/sds.h" void initRendering(); void freeRendering(); diff --git a/src/server-cli.c b/src/server-cli.c index 707c3ef..5e84ff6 100644 --- a/src/server-cli.c +++ b/src/server-cli.c @@ -1,5 +1,5 @@ -#include -#include +#include "util.h" +#include "server-connection.h" #include #include #include diff --git a/src/server-cli.h b/src/server-cli.h index b5b5875..8bc6ff2 100644 --- a/src/server-cli.h +++ b/src/server-cli.h @@ -1,7 +1,7 @@ #ifndef H_SERVER_CLI #define H_SERVER_CLI -#include +#include "sds/sds.h" void handleCLI(sds **vhosts, int vhostsc); diff --git a/src/server-connection.c b/src/server-connection.c index 466b259..3edd120 100644 --- a/src/server-connection.c +++ b/src/server-connection.c @@ -1,4 +1,4 @@ -#include +#include "server-connection.h" #include #include @@ -6,7 +6,7 @@ #include #include -#include +#include "util.h" sds constructFilePath(const sds root, const char* file); void sanitizeAddress(char* address); diff --git a/src/server-connection.h b/src/server-connection.h index 71447ff..689fbf4 100644 --- a/src/server-connection.h +++ b/src/server-connection.h @@ -1,7 +1,7 @@ #ifndef H_SERVER_CONNECTION #define H_SERVER_CONNECTION -#include +#include "sds/sds.h" #define vh_user 0 #define vh_path 1 diff --git a/src/server.c b/src/server.c index aeff800..1c157fe 100644 --- a/src/server.c +++ b/src/server.c @@ -14,11 +14,11 @@ #include #include -#include -#include +#include "sds/sds.h" +#include "util.h" -#include -#include +#include "server-connection.h" +#include "server-cli.h" int createCommunicationSocket(const char* ip, const char* port) { int fd_socket = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); -- cgit v1.2.3 From 4c3debc36ceaa7bc4857f61099e78de3b4e044b5 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 8 Jan 2024 19:01:10 +0200 Subject: [browser-cli,server-cli] Fixed security issues --- src/browser-cli.c | 4 ++-- src/server-cli.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/browser-cli.c b/src/browser-cli.c index 75a2374..1b2b446 100644 --- a/src/browser-cli.c +++ b/src/browser-cli.c @@ -59,7 +59,7 @@ void renderPage(const sds page) { /* In toPrint, replace '\16' with "\033[30;46m%d\033[0m", where %d is the variable i */ toPrint[anchorInd] = '\0'; newPrint = sdsgrowzero(sdsempty(), sdslen(toPrint) + digits(i) + 8 + 4); - sprintf(newPrint, "%s\033[30;46m%d\033[0m%s", toPrint, i, toPrint + anchorInd + 1); + snprintf(newPrint, sdslen(newPrint), "%s\033[30;46m%d\033[0m%s", toPrint, i, toPrint + anchorInd + 1); sdsfree(toPrint); toPrint = newPrint; @@ -172,7 +172,7 @@ int handleBrowserCLI(sds *host, sds *port, sds *uri, const sds page) { // Get command name and it's arguments // Currently no command takes arguments char name[MAX_LEN_COMMAND+1] = { '\0' }; - int argsAssigned = sscanf(line, COMMAND_FORMAT, name); + sscanf(line, COMMAND_FORMAT, name); // Flawfinder: ignore if (streq(name, "q") || streq(name, "e") || streq(name, "quit") || streq(name, "exit")) { return 1; diff --git a/src/server-cli.c b/src/server-cli.c index 5e84ff6..8d6b3ee 100644 --- a/src/server-cli.c +++ b/src/server-cli.c @@ -21,7 +21,7 @@ void handleCLI(sds **vhosts, int vhostsc) { // Get command name and it's arguments // Currently no command takes arguments char name[MAX_LEN_COMMAND+1]; - int argsAssigned = sscanf(line, COMMAND_FORMAT, name); + int argsAssigned = sscanf(line, COMMAND_FORMAT, name); // Flawfinder: ignore while (!streq(name, "q") && !streq(name, "e") && !streq(name, "quit") && !streq(name, "exit")) { if (argsAssigned < 1) { @@ -44,7 +44,7 @@ void handleCLI(sds **vhosts, int vhostsc) { // Get line and divided it into command name and arguments fgets(line, 256, stdin); - argsAssigned = sscanf(line, COMMAND_FORMAT, name); + argsAssigned = sscanf(line, COMMAND_FORMAT, name); // Flawfinder: ignore } printf("Exiting...\n"); -- cgit v1.2.3