krb5 commit: Move zero argc check earlier in ksu

Greg Hudson ghudson at mit.edu
Thu Apr 26 11:22:40 EDT 2018


https://github.com/krb5/krb5/commit/e1b5b824f5d7388a67d0854b56d3906c4fbdd778
commit e1b5b824f5d7388a67d0854b56d3906c4fbdd778
Author: Greg Hudson <ghudson at mit.edu>
Date:   Tue Apr 24 19:35:38 2018 -0400

    Move zero argc check earlier in ksu
    
    For improved auditability, check for a zero argc value earlier in
    main() so that the first two calls to com_err() can't pass a NULL
    whoami value--which would be harmless, but that may not be obvious to
    a reader.
    
    ticket: 8661

 src/clients/ksu/main.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
index 5e79ef5..30f6db7 100644
--- a/src/clients/ksu/main.c
+++ b/src/clients/ksu/main.c
@@ -121,6 +121,9 @@ main (argc, argv)
     krb5_boolean restrict_creds;
     krb5_deltat lifetime, rlife;
 
+    if (argc == 0)
+        exit(1);
+
     params = (char **) xcalloc (2, sizeof (char *));
     params[1] = NULL;
 
@@ -138,8 +141,6 @@ main (argc, argv)
         exit(1);
     }
 
-    if (argc == 0)
-        exit(1);
     if (strrchr(argv[0], '/'))
         argv[0] = strrchr(argv[0], '/')+1;
     prog_name = argv[0];


More information about the cvs-krb5 mailing list