Changeset 68 for trunk/src/sh_files.c

Timestamp:

Oct 30, 2006, 12:03:44 AM (18 years ago)

Author:

rainer

Message:

Update trunk to samhain 2.3

File:

• trunk/src/sh_files.c (modified) (11 diffs)

trunk/src/sh_files.c

@@ -1563 +1563 @@
    */
   sl_strlcpy (theFile.fullpath, iname, PATH_MAX);
+  theFile.attr_string = NULL;
 
   (void) relativeName;
@@ -1571 +1572 @@
   if ((sig_termfast == 1) || (sig_terminate == 1)) 
     {
+      if (theFile.attr_string) SH_FREE(theFile.attr_string);
       SL_RETURN((0), _("sh_files_checkdir"));
     }
@@ -1577 +1579 @@
     {
       SH_FREE(tmpname); 
+      if (theFile.attr_string) SH_FREE(theFile.attr_string);
       SL_RETURN((-1), _("sh_files_checkdir"));
     }
@@ -1586 +1589 @@
                        tmpname);
       SH_FREE(tmpname); 
+      if (theFile.attr_string) SH_FREE(theFile.attr_string);
       SL_RETURN((-1), _("sh_files_checkdir"));
     }
@@ -1607 +1611 @@
       SH_FREE(tmpname); 
 
+      if (theFile.attr_string) SH_FREE(theFile.attr_string);
       SL_RETURN((-1), _("sh_files_checkdir"));
     }
@@ -1660 +1665 @@
     if (sig_termfast == 1) 
       {
+        if (theFile.attr_string) SH_FREE(theFile.attr_string);
         SL_RETURN((0), _("sh_files_checkdir"));
       }
@@ -1850 +1856 @@
     if ((sig_termfast == 1) || (sig_terminate == 1)) 
       {
+        if (theFile.attr_string) SH_FREE(theFile.attr_string);
         SL_RETURN((0), _("sh_files_checkdir"));
       }
@@ -1896 +1903 @@
 #endif
 
+  if (theFile.attr_string) SH_FREE(theFile.attr_string);
   SH_FREE(tmpname);
 
@@ -1986 +1994 @@
    */
   sl_strlcpy (theFile.fullpath, fullpath, PATH_MAX);
-  theFile.check_mask = sh_files_maskof(class);
-  theFile.reported   = (*reported);
+  theFile.check_mask  = sh_files_maskof(class);
+  theFile.reported    = (*reported);
+  theFile.attr_string = NULL;
 
   TPT(( 0, FIL__, __LINE__, _("msg=<checking file: %s>\n"),  fullpath));
@@ -2001 +2010 @@
             fullpath, status));
       if (class == SH_LEVEL_ALLIGNORE && sh.flag.checkSum != SH_CHECK_INIT)
-          sh_hash_set_visited_true (fullpath);
+        sh_hash_set_visited_true (fullpath);
+      if (theFile.attr_string) 
+        SH_FREE(theFile.attr_string);
       SL_RETURN(SH_FILE_UNKNOWN, _("sh_files_filecheck"));
     }
@@ -2080 +2091 @@
     }
 #else
-      (void) rsrcflag; /* avoid compiler warning */
+  (void) rsrcflag; /* avoid compiler warning */
 #endif
 
  ret_point:
+
+  if (theFile.attr_string) SH_FREE(theFile.attr_string);
 
   switch (theFile.c_mode[0])