From fd6aa19eba017b9ce038e30e8b9549b80732b15e Mon Sep 17 00:00:00 2001 From: ENGO150 Date: Wed, 7 Dec 2022 17:30:47 +0100 Subject: [PATCH] added proper expression for comparing write & fread return values still not complete tho --- src/core/lib/encrypter.c | 2 +- src/core/lib/misc.c | 2 +- src/logger/lib/logger.c | 2 +- src/logger/lib/test/main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/lib/encrypter.c b/src/core/lib/encrypter.c index 66850f1..446d03b 100644 --- a/src/core/lib/encrypter.c +++ b/src/core/lib/encrypter.c @@ -58,7 +58,7 @@ outputFlags encryptText(char *text, char *keyNew) //TRY TO MAKE RANDOM GENERATION REALLY "RANDOM" fileBuffer = fopen("/dev/urandom", "r"); - if (fread(&numberBuffer, sizeof(numberBuffer), 1, fileBuffer) == 0) abort(); //TODO: Make it safe + if (fread(&numberBuffer, sizeof(numberBuffer), 1, fileBuffer) != 1) abort(); //TODO: Make it safe srand(numberBuffer); numberBuffer = abs(numberBuffer); //MAKE numberBuffer POSITIVE diff --git a/src/core/lib/misc.c b/src/core/lib/misc.c index 0233e67..2fa2eda 100644 --- a/src/core/lib/misc.c +++ b/src/core/lib/misc.c @@ -141,7 +141,7 @@ boolean checkVersion() strcpy(buffer, ""); //LOAD jsonFile - if (fread(buffer, bufferSize, 1, fileBuffer) == 0) abort(); //TODO: Make it safe + if (fread(buffer, bufferSize, 1, fileBuffer) != 1) abort(); //TODO: Make it safe buffer[bufferSize] = '\0'; diff --git a/src/logger/lib/logger.c b/src/logger/lib/logger.c index 649dd04..e7f5a2e 100644 --- a/src/logger/lib/logger.c +++ b/src/logger/lib/logger.c @@ -99,7 +99,7 @@ void writeLog(int loggerFile, char *logMessage) sprintf(buffer, WRITE_FORMATTING, tm.tm_hour, tm.tm_min, tm.tm_sec, logMessage); //LOAD MESSAGE - if (write(loggerFile, buffer, strlen(buffer)) == 0) abort(); //WRITE (YAY) //TODO: Find why the fuck you can't use version line bellow + if (write(loggerFile, buffer, strlen(buffer)) != (ssize_t) strlen(buffer)) abort(); //WRITE (YAY) //TODO: Find why the fuck you can't use version line bellow //(void) write(loggerFile, buffer, strlen(buffer)); //DEALLOCATION diff --git a/src/logger/lib/test/main.c b/src/logger/lib/test/main.c index a0eee48..6c0937d 100644 --- a/src/logger/lib/test/main.c +++ b/src/logger/lib/test/main.c @@ -40,7 +40,7 @@ int main(void) buffer = malloc(bufferSize + 1); //LOAD jsonFile - if (fread(buffer, bufferSize, 1, fileBuffer) == 0) abort(); //TODO: Make it safe + if (fread(buffer, bufferSize, 1, fileBuffer) != 1) abort(); //TODO: Make it safe printf("%s\n", buffer);