Changeset 383 for trunk/src/sh_utmp.c

Timestamp:

Dec 5, 2011, 10:30:33 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #281 (warnings from clang static analyzer).

File:

• trunk/src/sh_utmp.c (modified) (6 diffs)

trunk/src/sh_utmp.c

@@ -872 +872 @@
   SL_ENTER(_("sh_utmp_addlogin"));
 
+  if (ut->ut_line[0] == '\0')
+    SL_RET0(_("sh_utmp_addlogin"));
+
+  /* for some stupid reason, AIX repeats the wtmp entry for logouts
+   * with ssh
+   */
+  if (memcmp (&save_utmp, ut, sizeof(struct SH_UTMP_S)) == 0)
+    {
+      memset(&save_utmp, (int) '\0', sizeof(struct SH_UTMP_S));
+      SL_RET0(_("sh_utmp_addlogin"));
+    }
+  memcpy (&save_utmp, ut, sizeof(struct SH_UTMP_S));
+
   /* Take the address to keep gcc from putting them into registers. 
    * Avoids the 'clobbered by longjmp' warning. 
@@ -877 +890 @@
   sh_dummy_userold = (void*) &userold;
   sh_dummy_user    = (void*) &user;
-
-  if (ut->ut_line[0] == '\0')
-    SL_RET0(_("sh_utmp_addlogin"));
-
-  /* for some stupid reason, AIX repeats the wtmp entry for logouts
-   * with ssh
-   */
-  if (memcmp (&save_utmp, ut, sizeof(struct SH_UTMP_S)) == 0)
-    {
-      memset(&save_utmp, (int) '\0', sizeof(struct SH_UTMP_S));
-      SL_RET0(_("sh_utmp_addlogin"));
-    }
-  memcpy (&save_utmp, ut, sizeof(struct SH_UTMP_S));
-
 
   /* ------- find user -------- 
@@ -993 +992 @@
       
       sh_utmp_login_morechecks(ut);
-      SL_RET0(_("sh_utmp_addlogin"));
+      goto out;
     }
 
@@ -1052 +1051 @@
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
         }
-      SL_RET0(_("sh_utmp_addlogin"));
+      goto out;
     }
 
   /* default */
-  SL_RET0(_("sh_utmp_addlogin"));
+  goto out;
 
   /* #ifdef HAVE_UTTYPE                   */
@@ -1136 +1135 @@
     }
 
+#endif
+
+ out:
+  sh_dummy_user    = NULL;
+  sh_dummy_userold = NULL;
+
   SL_RET0(_("sh_utmp_addlogin"));
-#endif
 }
 
@@ -1214 +1218 @@
     {
       while (this_read < lastread) {
-        ut = sh_utmp_getutent();
+        (void) sh_utmp_getutent();
         ++this_read;
       }