Changes in trunk/src/sh_utils.c [20:29]

File:

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

trunk/src/sh_utils.c

@@ -189 +189 @@
 }
 
-int sh_util_hidesetup(char * c)
+int sh_util_hidesetup(const char * c)
 {
   int i;
@@ -205 +205 @@
   SL_ENTER(_("sh_util_strdup"));
 
-  if (str != NULL)
-    {
-      len = sl_strlen(str);
-      p   = SH_ALLOC (len + 1);
-      (void) sl_strlcpy (p, str, len+1);
-    }
+  SH_VALIDATE_NE(str, NULL);
+
+  len = sl_strlen(str);
+  p   = SH_ALLOC (len + 1);
+  (void) sl_strlcpy (p, str, len+1);
+
   SL_RETURN( p, _("sh_util_strdup"));
 }
@@ -224 +224 @@
   ret = *str;
 
-  if (ret == NULL) {
-    SL_RETURN(ret, _("sh_util_strsep"));
-  }
+  SH_VALIDATE_NE(ret, NULL);
 
   for (c = *str; *c != '\0'; c++) {
@@ -646 +644 @@
 static int sigtype = TYPE_HMAC;
 
-int sh_util_sigtype (char * c)
+int sh_util_sigtype (const char * c)
 {
   SL_ENTER(_("sh_util_sigtype"));
@@ -957 +955 @@
   char * key;
   char * path;
-  char * outpath;
+  char * outpath = NULL;
   unsigned char * image = NULL;
   long s = 0;
@@ -963 +961 @@
   long ii, k = 0;
   UINT32    * h1;
-  char * new;
+  char * new = NULL;
 
   if (0 != sl_is_suid())
@@ -999 +997 @@
       fprintf(stderr, 
               _("ERROR: no path to executable given\n Argument must be 'key@path'\n"));
+      free(new);
       _exit (EXIT_FAILURE);
       /*@notreached@*/
@@ -1005 +1004 @@
   else
     path = &new[j];
+
+  len = strlen(path) + 1 + 4;
   /*@-usedef@*/
-  if (NULL == (outpath = malloc(strlen(path) + 1 + 4)))
+  if (NULL == (outpath = malloc(len)))
     goto bail_mem;
   /*@-usedef@*/
-  /*@-bufferoverflowhigh@*/
-  sprintf (outpath, _("%s.out"), path);               /* known to fit  */ 
-  /*@+bufferoverflowhigh@*/
+  sl_snprintf (outpath, len, _("%s.out"), path);
 
   fp = sl_open_read(path, SL_NOPRIV);
@@ -1018 +1017 @@
       fprintf(stderr, 
               _("ERROR: cannot open %s for read (errnum = %ld)\n"), path, fp);
+      free(new); free (outpath);
       _exit (EXIT_FAILURE);
       /*@notreached@*/
@@ -1028 +1028 @@
       fprintf(stderr, 
               _("ERROR: cannot open %s (errnum = %ld)\n"), outpath, fout);
+      free(new); free (outpath);
       _exit (EXIT_FAILURE);
       /*@notreached@*/
@@ -1068 +1069 @@
           (void) sl_close (fout);
           printf(_("new file %s written\n"), outpath);
+          free(new); free (outpath); free(image);
           _exit (EXIT_SUCCESS);
           /*@notreached@*/
@@ -1076 +1078 @@
   fprintf(stderr, 
           _("ERROR: old key not found\n"));
+  free(new); free (outpath); free(image);
   _exit (EXIT_FAILURE);
   /*@notreached@*/
@@ -1084 +1087 @@
   fprintf(stderr, 
           _("ERROR: out of memory\n"));
+  if (new) free(new); 
+  if (outpath) free (outpath);
+  if (image) free (image);
   _exit (EXIT_FAILURE);
   /*@notreached@*/
@@ -1329 +1335 @@
 static unsigned char sh_obscure_index[256];
 
-int sh_util_obscure_ok (char * str)
+int sh_util_obscure_ok (const char * str)
 {
   unsigned long   i;
-  char * endptr = str;
-
-  SL_ENTER(_("sh_util_obscure_ex"));
+  char * endptr = NULL;
+
+  SL_ENTER(_("sh_util_obscure_ok"));
 
   if (0 == sl_strncmp("all", str, 3))
@@ -1342 +1348 @@
           sh_obscure_index[i] = (unsigned char)1;
         }
-      SL_RETURN(0, _("sh_util_obscure_ex"));
+      SL_RETURN(0, _("sh_util_obscure_ok"));
     }
 
@@ -1349 +1355 @@
       sh_obscure_index[i] = (unsigned char)0;
     }
+
+  i = strtoul (str, &endptr, 0);
+  if (i > 255)
+    {
+      SL_RETURN(-1, _("sh_util_obscure_ok"));
+    }
+  sh_obscure_index[i] = (unsigned char)1;
+  if (*endptr == ',')
+    ++endptr;
 
   while (*endptr != '\0')
@@ -1355 +1370 @@
       if (i > 255)
         {
-          SL_RETURN(-1, _("sh_util_obscure_ex"));
+          SL_RETURN(-1, _("sh_util_obscure_ok"));
         }
       sh_obscure_index[i] = (unsigned char)1;
@@ -1361 +1376 @@
         ++endptr;
     }
-  SL_RETURN(0, _("sh_util_obscure_ex"));
+  SL_RETURN(0, _("sh_util_obscure_ok"));
 }
 
 int sh_util_obscurename (ShErrLevel level, char * name_orig, int flag)
 {
-  char * name = name_orig;
+  unsigned char * name = (unsigned char *) name_orig;
   char * safe;
   unsigned int i;
@@ -1378 +1393 @@
   while (*name != '\0') 
     {
-      if ( (*name) == '"'  || (*name) == '\t' ||
+      if ( (*name) >  0x7F || (*name) == '"'  || (*name) == '\t' ||
            (*name) == '\b' || (*name) == '\f' || 
            (*name) == '\n' || (*name) == '\r' ||
@@ -1562 +1577 @@
     } else if (!isgraph ((int) *p)) {    /* not printable    */
       /*@-bufferoverflowhigh -formatconst@*/
+      /* flawfinder: ignore */
       sprintf(oct, format, '\\',                 /* known to fit  */
               (unsigned char) *p);