Changeset 34 for trunk/src/sh_mail.c

Timestamp:

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

Author:

rainer

Message:

Code cleanup and minor fixes

File:

• trunk/src/sh_mail.c (modified) (7 diffs)

trunk/src/sh_mail.c

@@ -173 +173 @@
       /* get signature and number 
        */
-      (void) sh_unix_getline (fd, key, (int)(  sizeof(key)-1));
+      (void) sh_unix_getline (fd, key, (int)sizeof(key));
       key[KEY_LEN] = '\0';
 
-      (void) sh_unix_getline (fd, number, (int)(sizeof(number)-1));
+      (void) sh_unix_getline (fd, number, (int)sizeof(number));
       number[(2*SH_MINIBUF) - 2]   = '\0';
       numsig = atol (number);
@@ -742 +742 @@
 static char * sh_mail_realloc (char * inbuf, size_t * insize, size_t increase)
 {
-  size_t newsize = (*insize) + increase + 1;
-  char * outbuf;
+  size_t newsize;
+  char * outbuf = inbuf;
 
   SL_ENTER(_("sh_mail_realloc"));
 
-  outbuf = SH_ALLOC(newsize);
-  MLOCK(outbuf, newsize);
-  (void) sl_strlcpy(outbuf, inbuf, newsize);
-
-  memset (inbuf, 0, (*insize));
-  MUNLOCK(inbuf, (*insize));
-  SH_FREE(inbuf);
-
-  *insize = newsize;
+  if (sl_ok_adds((*insize), 1))
+    {
+      newsize = (*insize) + 1;
+
+      if (sl_ok_adds(newsize, increase))
+        {
+          newsize += increase;
+
+          outbuf = SH_ALLOC(newsize);
+          MLOCK(outbuf, newsize);
+          (void) sl_strlcpy(outbuf, inbuf, newsize);
+
+          memset (inbuf, 0, (*insize));
+          MUNLOCK(inbuf, (*insize));
+          SH_FREE(inbuf);
+
+          *insize = newsize;
+        }
+    }
 
   SL_RETURN( (outbuf), _("sh_mail_realloc"));
@@ -1227 +1237 @@
 int sh_mail_set_relay (const char * str_s)
 {
-  size_t i = 0;
-
   SL_ENTER(_("sh_mail_set_relay"));
 
@@ -1235 +1243 @@
 
   if (relay_host != NULL)
-    SH_FREE (relay_host);
+    {
+      SH_FREE (relay_host);
+      relay_host = NULL;
+    }
 
   if (0 == sl_strncmp(str_s, _("NULL"), 4))
     {
-      relay_host = NULL;
       SL_RETURN( 0, _("sh_mail_set_relay"));
     }
 
-  i = sl_strlen(str_s) + 1;
-  relay_host = SH_ALLOC (i);
-  if (relay_host != NULL)
-    (void) sl_strlcpy(relay_host, str_s, i);
-  else
-    fprintf(stderr, _("ERROR:  sh_mail_set_relay: Out of memory"));
+  relay_host = sh_util_strdup(str_s);
+
   SL_RETURN( 0, _("sh_mail_set_relay"));
 }
@@ -1802 +1808 @@
     return NULL;
 
-  size   = strlen(str);
-  /* fprintf(stderr, "orig = %d\n", size); */
+  size   = strlen(str) + 1;
   blocks = 1 + (size / SPLIT_AT);
   
-  size   = size + (2*blocks) + 1;
+  if (sl_ok_muls(2, blocks) && sl_ok_adds(size, (2*blocks)))
+    {
+      size   = size + (2*blocks);
+    }
+  else
+    {
+      /* integer overflow, do not split */
+      p = sh_util_strdup(str);
+      return p;
+    }
+
   p = SH_ALLOC(size);
   memset(p, 0, size);
-  /* fprintf(stderr, "alloc = %d\n", size); */
+
   p0 = p;
 
@@ -1897 +1912 @@
   unsigned char * comp_dn, * eom;
   HEADER * header;
-  int      count, index, type, rdlength, pref;
+  int      type, rdlength, pref;
+  unsigned int count, index;
   dnsrep * retval;
 
@@ -1978 +1994 @@
   /* allocate space for the results */
 
+  if (!sl_ok_muls(count, sizeof (mx)))
+    {
+      SH_FREE   (retval);
+      SL_RETURN (NULL, _("get_mx"));
+    }
+
   result        = SH_ALLOC (count * sizeof (mx));
+  
   if (!result)
     {