Changeset 34 for trunk/src/sh_err_log.c

Timestamp:

May 19, 2006, 8:09:51 PM (18 years ago)

Author:

rainer

Message:

Code cleanup and minor fixes

File:

• trunk/src/sh_err_log.c (modified) (4 diffs)

trunk/src/sh_err_log.c

@@ -390 +390 @@
                   (void) fflush(stdout); 
                   key[0] = '\0';
-                  (void) fgets(key, KEY_LEN+2, stdin);
+                  (void) fgets(key, sizeof(key), stdin);
                   if (key[0] != '\n') 
                     {
@@ -553 +553 @@
         {
           tmp  = sh_util_safe_name (logfile);
-          len      = 6 + sl_strlen(tmp);
+          len      = sl_strlen(tmp);
+          if (sl_ok_adds (6, len))
+            len += 6;
           lockfile = SH_ALLOC(len);
           (void) sl_strlcpy(lockfile,        tmp, len);
@@ -634 +636 @@
 
   SL_TICKET            fd = -1;
-  long int             status;
+  size_t               status;
   struct _sh_log_buf   log_msg;
 
@@ -749 +751 @@
    */
 
-  status      = (long) sl_strlen (errmsg);
+  status      =  sl_strlen (errmsg);
+  if (!sl_ok_adds(status, (2*KEY_LEN)) || !sl_ok_adds((2*KEY_LEN + status),32))
+    {
+      SL_RETURN ((-1), _("sh_log_file"));
+    }
+      
   log_msg.msg = (char *) SH_ALLOC ((size_t) (2*KEY_LEN + status + 32));