Changeset 22 for trunk/src/samhain.c

Timestamp:

Feb 23, 2006, 12:03:58 AM (19 years ago)

Author:

rainer

Message:

Minor code revisions.

File:

• trunk/src/samhain.c (modified) (13 diffs)

trunk/src/samhain.c

@@ -382 +382 @@
    */
   (void) sl_strlcpy (sh.host.name,  _("localhost"),  SH_MINIBUF);
-  sh.host.system[0]     = '\0';
+  sh.host.system[0]     = '\0'; /* flawfinder: ignore *//* ff bug */
   sh.host.release[0]    = '\0';
   sh.host.machine[0]    = '\0';
@@ -582 +582 @@
   skey->mailkey_old[0]  = '\0';
   skey->mailkey_new[0]  = '\0';
-  skey->crypt[0]        = '\0';
+  skey->crypt[0]        = '\0'; /* flawfinder: ignore *//* ff bug */
   skey->session[0]      = '\0';
   skey->vernam[0]       = '\0';
@@ -725 +725 @@
   char         exef[128];
 
+  if (!pidlist)
+    return NULL;
+
   for (i = 0; i < 65535; ++i) pidlist[i] = 0;
   i = 0;
 
   if (0 != stat(SH_INSTALL_PATH, &buf))
-    return NULL;
+    {
+      free(pidlist);
+      return NULL;
+    }
 
   ino = (long) buf.st_ino;
     
   if (NULL == (dp = opendir("/proc")))
-    return NULL;
+    {
+      free(pidlist);
+      return NULL;
+    }
   while (NULL != (d = readdir(dp)) && i < 65535)
     {
@@ -860 +869 @@
 
 
-  fullpath = malloc(strlen(SH_INSTALL_PATH)+1);
+  fullpath = strdup (SH_INSTALL_PATH);
   if (fullpath == NULL)
-    { perror(_("malloc")); exit (1); }
-  else
-    strcpy(fullpath, SH_INSTALL_PATH);                 /* known to fit  */
-
-  argp[0] = malloc(strlen(SH_INSTALL_PATH)+1);
+    { perror(_("strdup")); exit (1); }
+
+  argp[0]  = strdup (SH_INSTALL_PATH);
   if (argp[0] == NULL)
-    { perror(_("malloc")); exit (1); }
-  else
-    strcpy(argp[0], SH_INSTALL_PATH);                  /* known to fit  */
-
+    { perror(_("strdup")); exit (1); }
 
   for (times = 1; times < 32; ++times)  argp[times] = NULL;
@@ -879 +883 @@
   for (times = 2; times < res; ++times)  
     {
-      argp[times-1] = malloc(strlen(argv[times])+1);
+      argp[times-1] = strdup (argv[times]);
       if (argp[times-1] == NULL)
-        { perror(_("malloc")); exit (1); }
-      else
-        strcpy(argp[times-1], argv[times]);              /* known to fit  */
+        { perror(_("strdup")); exit (1); }
     }
 
@@ -903 +905 @@
             _exit(4);
           }
-        (void) execv(fullpath, argp); 
+        (void) execv(fullpath, argp); /* flawfinder: ignore *//* wtf? */
         if (errno == EPERM)
           _exit(4);
@@ -941 +943 @@
       pidlist = procdirSamhain ();
       if (pid == 0 && NULL == pidlist) /* pid file not found */ 
-        return (0);
+        {
+          free(fullpath);
+          return (0);
+        }
           
       status = 0;
@@ -956 +961 @@
             }
         }
+      free(fullpath);
       if (status == 7)
         return 0;
@@ -992 +998 @@
         }
     }
-
+  free(fullpath); /* silence smatch false positive */
   exit (1); /* no exit handler installed yet */
   /*@notreached@*/
@@ -1022 +1028 @@
 /* Add a new schedule to the linked list of schedules
  */
-static sh_schedule_t * sh_set_schedule_int (char * str, 
+static sh_schedule_t * sh_set_schedule_int (const char * str, 
                                             sh_schedule_t * FileSchedIn, 
                                             /*@out@*/ int * status)
@@ -1052 +1058 @@
 /* Add a new schedule to the linked list FileSchedOne
  */
-int sh_set_schedule_one (char * str)
+int sh_set_schedule_one (const char * str)
 {
   int status;
@@ -1061 +1067 @@
 /* Add a new schedule to the linked list FileSchedTwo
  */
-int sh_set_schedule_two (char * str)
+int sh_set_schedule_two (const char * str)
 {
   int status;
@@ -1214 +1220 @@
   /* Save the timezone.
    */
-  if ((tzptr = getenv("TZ")) != NULL)
+  if (NULL != (tzptr = getenv("TZ"))) /* flawfinder: ignore */
     {
       tzlen       = strlen(tzptr);
-       sh.timezone = malloc (tzlen + 1);
-      if (sh.timezone != NULL)
-         (void) sl_strlcpy (sh.timezone, tzptr, tzlen + 1);
+      if (tzlen < 1024)
+        {
+          sh.timezone = malloc (tzlen + 1);
+          if (sh.timezone != NULL)
+            (void) sl_strlcpy (sh.timezone, tzptr, tzlen + 1);
+        }
+      else
+        sh.timezone = NULL;
     }
   else