Changeset 579 for trunk/src

Timestamp:

May 14, 2023, 10:08:17 PM (18 months ago)

Author:

katerina

Message:

Fix for ticket #467 (memleak).

Location:

trunk/src

Files:

• samhain.c (modified) (1 diff)
• sh_dbIO.c (modified) (1 diff)
• sh_files.c (modified) (2 diffs)
• sh_mem.c (modified) (3 diffs)
• sh_sig.c (modified) (7 diffs)
• sh_unix.c (modified) (3 diffs)

trunk/src/samhain.c

@@ -777 +777 @@
   sh_hash_hashdelete();
   sh_files_hle_reg (NULL);
+  (void) sh_ignore_clean ();
   /*
    * Only flush on exit if running as deamon.

trunk/src/sh_dbIO.c

@@ -1415 +1415 @@
     lpath = ll;
   else
+    /* cppcheck-suppress uninitvar */
     lpath = linkpath;
 

trunk/src/sh_files.c

@@ -2315 +2315 @@
             { 
               ++theDir->NumDirs;
+#if defined(SH_USE_SCANDIR)
+              free(entryList[entry]); /* scandir() mallocs entries */
+#endif
               continue;
             }
@@ -2320 +2323 @@
             {
               ++theDir->NumDirs;
+#if defined(SH_USE_SCANDIR)
+              free(entryList[entry]); /* scandir() mallocs entries */
+#endif
               continue;
             }

trunk/src/sh_mem.c

@@ -77 +77 @@
 #endif
 
-/* define MEM_LOG to an absolute filename to enable this */
+/* define MEM_LOG to enable this */
+/* #define MEM_LOG 1 */
 #ifdef MEM_LOG
 void sh_mem_dump ()
@@ -83 +84 @@
   memlist_t   * this = memlist;
   FILE * fd;
-
+  static unsigned int nr = 0;
+  char filename[256];
+
+  snprintf(filename, sizeof(filename), "sh_mem_dump.%04u.%lu", nr, (unsigned long) sh.pid);
+  
   SH_MUTEX_RECURSIVE_INIT(mutex_mem);
   SH_MUTEX_RECURSIVE_LOCK(mutex_mem);
 
-  fd = fopen(MEM_LOG, "w");
+  fd = fopen(filename, "w");
   if (!fd)
     {
-      perror(MEM_LOG);
+      perror(filename);
       _exit(EXIT_FAILURE);
     }
@@ -103 +108 @@
 
   SH_MUTEX_RECURSIVE_UNLOCK(mutex_mem);
-  _exit(EXIT_SUCCESS);
+  ++nr;
+  /* _exit(EXIT_SUCCESS); */
+  return;
 }
 #else

trunk/src/sh_sig.c

@@ -1695 +1695 @@
 #elif defined(WITH_SIGNIFY)
   return sh_signify_check_signature (file, what);
+#else
+  return -1;
 #endif
 }
@@ -1704 +1706 @@
 #elif defined(WITH_SIGNIFY)
   return sh_signify_extract_signed(fd, SIG_DATASIG);
+#else
+  return -1;
 #endif
 }
@@ -1713 +1717 @@
 #elif defined(WITH_SIGNIFY)
   return sh_signify_extract_signed(fd, SIG_DATAONLY);
+#else
+  return -1;
 #endif
 }
@@ -1722 +1728 @@
 #elif defined(WITH_SIGNIFY)
   return sh_signify_msg_start(line);
+#else
+  return -1;
 #endif
 }
@@ -1731 +1739 @@
 #elif defined(WITH_SIGNIFY)
   return sh_signify_msg_startdata(line);
+#else
+  return -1;
 #endif
 }
@@ -1740 +1750 @@
 #elif defined(WITH_SIGNIFY)
   return sh_signify_msg_end(line);
+#else
+  return -1;
 #endif
 }
@@ -1749 +1761 @@
 #elif defined(WITH_SIGNIFY)
   return sh_signify_data_end(line);
+#else
+  return -1;
 #endif
 }

trunk/src/sh_unix.c

@@ -3603 +3603 @@
               }
             }
-          SH_FREE(rotated_file);
-        }
+        }
+      if (rotated_file) {
+        SH_FREE(rotated_file);
+      }
     }
   return retval;
@@ -4872 +4874 @@
   if (0 == retry_lstat(FIL__, __LINE__, path, &buf))
     SL_RETURN( S_TRUE,   _("sh_unix_file_exists"));
-  else 
-    SL_RETURN( S_FALSE,  _("sh_unix_file_exists"));
+
+  SL_RETURN( S_FALSE,  _("sh_unix_file_exists"));
 }
 
@@ -4888 +4890 @@
   if (retry_fstat(FIL__, __LINE__, fd, &buf) == -1)
     SL_RETURN( (-1), _("sh_unix_device_readable"));
-  else if ( S_ISCHR(buf.st_mode) &&  0 != (S_IROTH & buf.st_mode) ) 
+  if ( S_ISCHR(buf.st_mode) &&  0 != (S_IROTH & buf.st_mode) ) 
     SL_RETURN( (0), _("sh_unix_device_readable"));
-  else 
-    SL_RETURN( (-1), _("sh_unix_device_readable"));
+
+  SL_RETURN( (-1), _("sh_unix_device_readable"));
 }