Check for NULL realm argument and n not equal to 1. Fill in realm with an empty...

ticket: 1657

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15684 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 5996d991a2601d5fb0c1a69397c78f3515f12447..f8da81e90acaad9172554907b2ccd8c74ee9181e 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-11  Alexandra Ellwood  <lxs@mit.edu>
+
+        * RealmsConfig-glue.c: Check for NULL realm argument and n
+        not equal to 1.  Fill in realm with an empty string on error 
+        in case the caller doesn't check the return value.
+
 2003-07-11  Alexandra Ellwood  <lxs@mit.edu>
 
         * RealmsConfig-glue.c: Don't fail when krb5.conf is valid

diff --git a/src/lib/krb4/RealmsConfig-glue.c b/src/lib/krb4/RealmsConfig-glue.c
index fc9bdc8f34b43a129e9e798c60c8536cc9570f80..0635284c05b54d4b63c92c59b1d801c751e8bd9c 100644 (file)
--- a/src/lib/krb4/RealmsConfig-glue.c
+++ b/src/lib/krb4/RealmsConfig-glue.c
@@ -199,6 +199,14 @@ krb_get_lrealm(
     char        krbConfLocalRealm[REALM_SZ];
     int         krbConfHasLocalRealm = 0;
 
+    if ((realm == NULL) || (n != 1)) { result = KFAILURE; }
+
+    if (result == KSUCCESS) {
+        /* Some callers don't check the return value so we initialize
+         * to an empty string in case it never gets filled in. */
+        realm [0] = '\0';  
+    }
+    
     if (result == KSUCCESS) {
         int profileErr = krb_get_profile (&profile);