Changeset 34 for trunk/src/sh_utils.c

Timestamp:

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

Author:

rainer

Message:

Code cleanup and minor fixes

File:

• trunk/src/sh_utils.c (modified) (17 diffs)

trunk/src/sh_utils.c

@@ -270 +270 @@
   size = sl_strlen(formatt);
 
-  fmt = (char *) SH_ALLOC(size + 1);
-  (void) sl_strlcpy(fmt, formatt, size + 1);
+  if (!sl_ok_adds(size, 1))
+    SL_RETURN(NULL, _("sh_util_formatted"));
+
+  ++size;
+  fmt = SH_ALLOC(size);
+  (void) sl_strlcpy(fmt, formatt, size);
 
   p = fmt;
@@ -319 +323 @@
                 {
                   isiz = sl_strlen(ftab[j].data_str);
-                  if (isiz > 0)
+                  if (isiz > 0 && sl_ok_adds(size, isiz))
                     {
                       size += isiz;
@@ -339 +343 @@
                   /*@+bufferoverflowhigh@*/
                   isiz = sl_strlen(ftab[j].data_str);
-                  if (isiz > 0)
+                  if (isiz > 0 && sl_ok_adds(size, isiz))
                     {
                       size += isiz;
@@ -359 +363 @@
                   /*@+bufferoverflowhigh@*/
                   isiz = sl_strlen(ftab[j].data_str);
-                  if (isiz > 0)
+                  if (isiz > 0 && sl_ok_adds(size, isiz))
                     {
                       size += isiz;
@@ -391 +395 @@
                     }
                   isiz = sl_strlen(ftab[j].data_str);
-                  if (isiz > 0)
+                  if (isiz > 0 && sl_ok_adds(size, isiz))
                     {
                       size += isiz;
@@ -431 +435 @@
   /* -- closing '\0' --
    */
-  size++;
+  if (sl_ok_adds(size, 1))
+    size++;
   outstr = (char *) SH_ALLOC(size);
 
@@ -441 +446 @@
                       clist[8],  clist[9], clist[10], clist[11], 
                       clist[12], clist[13], clist[14], clist[15]); 
-  
+  outstr[size-1] = '\0';
+
   /* -- cleanup --
    */
@@ -491 +497 @@
   SL_ENTER(_("sh_util_hextobinary"));
 
-  while (i < bytes)
+  if (bytes < 2)
+    SL_RETURN((-1), _("sh_util_hextobinary"));
+
+  while (i < (bytes-1))
     {
       SH_HEXCHAR(hex[i],   k);
@@ -498 +507 @@
       binary[l] = (char)(k * 16 + j);
       ++l; i+= 2;
-
-      /* k = sh_util_hexchar(hex[i]); j = sh_util_hexchar(hex[i+1]); 
-      if (k != -1 && j != -1) 
-        {
-          binary[l] = (char)(k * 16 + j);
-          ++l; i+= 2;
-        }
-      else
-        {
-          SL_RETURN((-1), _("sh_util_hextobinary"));
-        }
-      */
     }
   
@@ -581 +578 @@
     }
 
-  inner = (char *) SH_ALLOC (textlen + KEY_BLOCK); 
-
-  for (i = 0; i < KEY_BLOCK; ++i)
-    {
-      outer[i]  = K[i] ^ opad[i];
-      inner[i]  = K[i] ^ ipad[i];
-    }
-  for (i = KEY_BLOCK; i < (KEY_BLOCK+textlen); ++i)
-    {
-      inner[i] = text[i - KEY_BLOCK];
+  if (sl_ok_adds(textlen, KEY_BLOCK))
+    {
+      inner = (char *) SH_ALLOC (textlen + KEY_BLOCK); 
+
+      for (i = 0; i < KEY_BLOCK; ++i)
+        {
+          outer[i]  = K[i] ^ opad[i];
+          inner[i]  = K[i] ^ ipad[i];
+        }
+      for (i = KEY_BLOCK; i < (KEY_BLOCK+textlen); ++i)
+        {
+          inner[i] = text[i - KEY_BLOCK];
+        }
+    }
+  else
+    {
+      sh_error_handle((-1), FIL__, __LINE__, -1, MSG_E_SUBGEN,
+                      _("integer overflow"), 
+                      _("sh_util_hmac_tiger"));
+      res = sh_tiger_hash (NULL, TIGER_DATA, 0);
+      SL_RETURN(res, _("sh_util_hmac_tiger"));
     }
 
@@ -1421 +1429 @@
 /* returns freshly allocated memory, return value should be free'd
  */
-char * sh_util_basename(char * fullpath)
+char * sh_util_dirname(const char * fullpath)
 {
   char * retval;
-  size_t i;
+  size_t len;
+
+  SL_ENTER(_("sh_util_dirname"));
+
+  ASSERT_RET ((fullpath != NULL), _("fullpath != NULL"), (NULL))
+
+  len = sl_strlen (fullpath);  /* fullpath[i] is terminating '\0' */
+
+  if (len > 1 && fullpath[len-1] == '/') /* skip trailing '/' */
+    --len;
+
+  while (len > 0) {
+    --len;
+    if (fullpath[len] == '/') 
+      {
+        if (len == 0) ++len; /* copy the '/' to output */
+        break;
+      }
+  }
+
+  /* -- Not an absolute path. --
+   */
+  if ((len == 0) && (fullpath[len] != '/'))
+    { 
+      SL_RETURN(NULL, _("sh_util_dirname"));
+    }
+
+  retval = SH_ALLOC(len + 1);
+  (void) sl_strlcpy (retval, fullpath, len+1);
+
+  SL_RETURN(retval, _("sh_util_dirname"));
+}
+
+/* returns freshly allocated memory, return value should be free'd
+ */
+char * sh_util_basename(const char * fullpath)
+{
+  char * retval = NULL;
+  char * tmp;
+  char * c;
+  size_t len;
 
   SL_ENTER(_("sh_util_basename"));
@@ -1430 +1478 @@
   ASSERT_RET ((fullpath != NULL), _("fullpath != NULL"), (NULL))
 
-  i = sl_strlen (fullpath);  /* fullpath[i] is terminating '\0' */
-
-  while (i > 0) {
-    --i;
-    if (fullpath[i] == '/') break;
-  }
-
-  /* -- Not a valid path. --
-   */
-  if ((fullpath[i] != '/') && (i == 0) ) 
-    SL_RETURN(NULL, _("sh_util_basename"));
-
-  retval = SH_ALLOC(i + 1);
-
-  (void) sl_strlcpy (retval, fullpath, i+1);
+  c = strrchr(fullpath, '/');
+  len = sl_strlen (c);
+
+  if (c == fullpath)
+    {
+      if (len <= 1)
+        retval = sh_util_strdup(c);
+      else
+        retval = sh_util_strdup(++c);
+    }
+  else
+    {
+      if (len > 1)
+        {
+          retval = sh_util_strdup(++c);
+        }
+      else
+        {
+          /* input ends in '/' */
+          tmp = sh_util_strdup(fullpath);
+          tmp[strlen(tmp)-1] = '\0';
+          retval = sh_util_basename(tmp);
+          SH_FREE(tmp);
+        }
+    }
 
   SL_RETURN(retval, _("sh_util_basename"));
-}
-
-/* returns freshly allocated memory, return value should be free'd
- */
-char * sh_util_filename(char * fullpath)
-{
-  char * retval;
-  char * c;
-  size_t i;
-
-  SL_ENTER(_("sh_util_filename"));
-
-  ASSERT_RET ((fullpath != NULL), _("fullpath != NULL"), (NULL))
-
-  c = strrchr(fullpath, '/');
-  i = sl_strlen (c);
-  if (i <= 1) SL_RETURN(NULL, _("sh_util_filename")); /* ends in '/' */
-  ++c;
-  --i;
-
-  retval = SH_ALLOC(i + 1);
-
-  (void) sl_strlcpy (retval, c, i+1);
-
-  SL_RETURN(retval, _("sh_util_filename"));
 }
 
@@ -1484 +1517 @@
   char          oct[32];
   char          format[16];
+  size_t        len;
 
   SL_ENTER(_("sh_util_safe_name"));
@@ -1500 +1534 @@
   */
 
+  len = sl_strlen(name);
+  p   = name;
+
 #ifdef SH_USE_XML
-  retval = SH_ALLOC(6 * sl_strlen(name) + 2);
+  if (sl_ok_muls (6, len) && sl_ok_adds ((6*len), 2))
+    { retval = SH_ALLOC(6 * len + 2); }
+  else
+    {
+      /* return an allocated array
+       */
+      retval = SH_ALLOC(11);
+      (void) sl_strlcpy(retval, _("(overflow)"), 11);
+      SL_RETURN(retval, _("sh_util_safe_name"));
+    }
 #else
-  retval = SH_ALLOC(4 * sl_strlen(name) + 2);
+  if (sl_ok_muls (4, len) && sl_ok_adds ((4*len), 2))
+    { retval = SH_ALLOC(4 * len + 2); }
+  else
+    {
+      /* return an allocated array
+       */
+      retval = SH_ALLOC(11);
+      (void) sl_strlcpy(retval, _("(overflow)"), 11);
+      SL_RETURN(retval, _("sh_util_safe_name"));
+    }
 #endif 
 
   (void) sl_strncpy(format, _("%c%03o"), 16);
-
-  p = name;
 
   while (*p != '\0') {
@@ -1613 +1666 @@
 char * sh_util_strconcat (const char * arg1, ...)
 {
-  size_t    length;
+  size_t    length, l2;
   char    * s;
   char    * strnew;
@@ -1628 +1681 @@
   while (s != NULL)
     {
-      length = length + sl_strlen (s);
+      l2 = sl_strlen (s);
+      if (sl_ok_adds(length, l2))
+        length += l2;
+      else
+        SL_RETURN(NULL, _("sh_util_strconcat"));
       s = va_arg (vl, char * );
     }
   va_end (vl);
 
-  strnew = SH_ALLOC( length + 2 ); 
+  if (sl_ok_adds(length, 2))
+    strnew = SH_ALLOC( length + 2 );
+  else
+    SL_RETURN(NULL, _("sh_util_strconcat"));
+
   strnew[0] = '\0';
 
@@ -1680 +1741 @@
   if (status != 0 && status != REG_NOMATCH) 
     {
-      errbuf = SH_ALLOC(BUFSIZ+2);
+      errbuf = SH_ALLOC(BUFSIZ);
       (void) regerror(status, &preg, errbuf, BUFSIZ); 
-      errbuf[BUFSIZ] = '\0';
+      errbuf[BUFSIZ-1] = '\0';
       sh_error_handle ((-1), FIL__, __LINE__, status, MSG_E_REGEX,
                        errbuf, regex_str);