[FIX] [valord]: fix crash because of non-resetted errors

0xf104a · May 27, 2024 · 0a5a47d · 0a5a47d
1 parent ebf88b5
commit 0a5a47d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/valord/src/process.c b/valord/src/process.c
@@ -16,6 +16,7 @@
 
 
 char *make_proc_path(char *dirname) {
+    reset_errors;
     char *path = (char *) malloc((7 + strlen(dirname)) * sizeof(char));
     cerror("malloc");
     strcpy(path, "/proc/");
@@ -57,7 +58,7 @@ char *get_process_comm(const char *proc_path) {
     if (!file) {
 #if DEBUG
         error("Failed to open file: %s", filename);
-        perror("fopen");
+        valor_perror("fopen");
 #endif
         free(filename);
         return NULL;

diff --git a/valord/src/util.c b/valord/src/util.c
@@ -28,8 +28,8 @@ bool is_int(char *str) {
 /**
  * Prints error to log. Does not exits from program
  * @param _name name of call where error may occur
- * @param _file name of file of perror call(passed by macro)
- * @param _line number of line of perror call(passed by macro)
+ * @param _file name of file of valor_perror call(passed by macro)
+ * @param _line number of line of valor_perror call(passed by macro)
  * @return whether there was an error
  */
 bool perror_internal(const char *_name, const char *_file, int _line) {

diff --git a/valord/src/util.h b/valord/src/util.h
@@ -12,7 +12,7 @@
  * @note Resets global errno variable to 0 after execution
  * @return whether there was an error
  */
-#define perror(c) perror_internal(c, __FILE__, __LINE__)
+#define valor_perror(c) perror_internal(c, __FILE__, __LINE__)
 
 /**
  * Resets last error

diff --git a/valord/src/valor.c b/valord/src/valor.c
@@ -14,7 +14,7 @@
 #include <unistd.h>
 
 
-const char *VERSION = "0.2.3";
+const char *VERSION = "0.2.4";
 const char *DB_FILE = "/system/etc/valor.db";
 const uint8_t IDLE_TIME = 3;
 
@@ -79,7 +79,7 @@ int main(void) {
                 warn("Detected threat by name %s", proc.comm);
                 reset_errors;
                 kill(proc.pid, 9);
-                if (!perror("kill")) {
+                if (!valor_perror("kill")) {
                     info("Sent signal 9 to %d", proc.pid);
                 }
             } else if(proc.comm != NULL) {
@@ -91,7 +91,7 @@ int main(void) {
                         warn("Threat with PID %d is matching to database checksum on %.2f%%", matching_k * 100.0);
                         reset_errors;
                         kill(proc.pid, 9);
-                        if (!perror("kill")) {
+                        if (!valor_perror("kill")) {
                             info("Sent signal 9 to %d", proc.pid);
                         }
                     }