Changeset 590 for trunk/src/sh_suidchk.c

Timestamp:

Oct 27, 2025, 6:57:03 PM (17 hours ago)

Author:

katerina

Message:

Fix for ticket #478 (cppcheck warnings).

File:

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

trunk/src/sh_suidchk.c

@@ -1019 +1019 @@
   SL_ENTER(_("sh_suidchk_check_internal"));
 
+  if (iname == NULL)
+    {
+      TPT((0, FIL__, __LINE__ , _("msg=<directory name is NULL>\n")));
+      SL_RETURN( (-1), _("sh_suidchk_check_internal"));
+    }
+
+  if (sig_urgent > 0) {
+    SL_RETURN( (0), _("sh_suidchk_check_internal"));
+  }
+
   /* Take the address to keep gcc from putting it into a register. 
    * Avoids the 'clobbered by longjmp' warning. 
@@ -1024 +1034 @@
   sh_dummy_idirlist = (void*) &dirlist;
   sh_dummy_itmp     = (void*) &tmp;
-
-  if (iname == NULL)
-    {
-      TPT((0, FIL__, __LINE__ , _("msg=<directory name is NULL>\n")));
-      SL_RETURN( (-1), _("sh_suidchk_check_internal"));
-    }
-
-  if (sig_urgent > 0) {
-    SL_RETURN( (0), _("sh_suidchk_check_internal"));
-  }
 
   thisDir = opendir (iname);
@@ -1047 +1047 @@
       SH_MUTEX_UNLOCK(mutex_thread_nolog);
       SH_FREE(tmp);
+      sh_dummy_idirlist = NULL;
+      sh_dummy_itmp     = NULL;
       SL_RETURN( (-1), _("sh_suidchk_check_internal"));
     }
@@ -1412 +1414 @@
   kill_sh_dirlist (dirlist_orig);
 
+  sh_dummy_idirlist = NULL;
+  sh_dummy_itmp     = NULL;
+
   SL_RETURN( (0), _("sh_suidchk_check_internal"));
 }
@@ -2193 +2198 @@
    Return "unknown" if its filesystem type is unknown.  */
 
-static char *
-filesystem_type (char * path, char * relpath, struct stat * statp)
+static char * filesystem_type (char * path, char * relpath, struct stat * statp)
 {
   static char *current_fstype = NULL;
@@ -2218 +2222 @@
 void * sh_dummy_2229_type;
 
-static char *
-filesystem_type_uncached (path, relpath, statp)
-     char *path;
-     char *relpath;
-     struct stat *statp;
+static char * filesystem_type_uncached (char * path, char * relpath, struct stat * statp)
 {
   char * type = NULL;
@@ -2234 +2234 @@
   struct mntent *mnt;
 
+  if (path == NULL || relpath == NULL)
+    return NULL;
+
   /* Take the address to keep gcc from putting it into a register. 
    * Avoids the 'clobbered by longjmp' warning. 
    */
   sh_dummy_2229_type = (void *) &type;
-
-  if (path == NULL || relpath == NULL)
-    return NULL;
 
   mfp = setmntent (table, "r");
@@ -2250 +2250 @@
                        _("filesystem_type_uncached") );
       SH_MUTEX_UNLOCK(mutex_thread_nolog);
+      sh_dummy_2229_type = NULL;
       return NULL;
     }
@@ -2378 +2379 @@
                            _("filesystem_type_uncached") );
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
+          sh_dummy_2229_type = NULL;
           return NULL;
         }
@@ -2406 +2408 @@
                            _("filesystem_type_uncached") );
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
+          sh_dummy_2229_type = NULL;
           return NULL;
         }
@@ -2453 +2456 @@
                            _("filesystem_type_uncached") );
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
+          sh_dummy_2229_type = NULL;
           return NULL;
         }
@@ -2492 +2496 @@
   fstype_known = (int)(type != NULL);
 
+  sh_dummy_2229_type = NULL;
   return sh_util_strdup (type ? type : "unknown");
 }
@@ -2500 +2505 @@
    part of CP. */
 
-static int
-xatoi (cp)
-     const char *cp;
+static int xatoi (const char * cp)
 {
   int val;