* src/login.c: Added assert()s for NULL (or ! NULL) username, and

	pwd. This helps splint.

diff --git a/ChangeLog b/ChangeLog
index eabbe5171ef9e7e108a7c4eaa9d88ab00b978589..3caff5ce86926eb57168a250ba0bb39fa35ce123 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-22  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/login.c: Added assert()s for NULL (or ! NULL) username, and
+       pwd. This helps splint.
+
 2009-04-22  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/login.c: After login_prompt(), do not check for unset

diff --git a/src/login.c b/src/login.c
index 65113bbe5fbfb64c691a57293c49056b28eecb6e..77abe109607b1405643b486c03e090532ba99a30 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -347,6 +347,7 @@ static void process_flags (int argc, char *const *argv)
         *  Get the user name.
         */
        if (optind < argc) {
+               assert (NULL == username);
                username = xstrdup (argv[optind]);
                strzero (argv[optind]);
                ++optind;
@@ -610,6 +611,7 @@ int main (int argc, char **argv)
        }
 #ifdef RLOGIN
        if (rflg) {
+               assert (NULL == username);
                username = xmalloc (USER_NAME_MAX_LENGTH + 1);
                username[USER_NAME_MAX_LENGTH] = '\0';
                if (do_rlogin (hostname, username, USER_NAME_MAX_LENGTH, term, sizeof term)) {
@@ -1079,6 +1081,8 @@ int main (int argc, char **argv)
                }
        }                       /* while (true) */
 #endif                         /* ! USE_PAM */
+       assert (NULL != username);
+       assert (NULL != pwd);
 
        (void) alarm (0);               /* turn off alarm clock */