Check to see if the global_param's stash file is non-NULL before

trying to strdup() it.  [PR#341, PR#394]

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

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 9a653a391c1da03c1b899bfc218fd45681d02e24..803d5deb528c980b82f75ddb7192311837d0ad91 100644 (file)
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 12 01:19:51 1997  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * loadv4.c (argv): Check to see if the global_param's stash file
+               is non-NULL before trying to strdup() it.  [PR#341, PR#394]
+
 Tue Feb  4 21:17:09 1997  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in:

diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index 238a187cf52f6d217edc3f9f70973749f7b52b67..90fb001e5ed8171827b6d40fa3f7528d3545b144 100644 (file)
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -194,7 +194,8 @@ char *argv[];
     dbname = global_params.dbname;
     mkey_name = global_params.mkey_name;
     master_keyblock.enctype = global_params.enctype;
-    stash_file = strdup(global_params.stash_file);
+    if (global_params.stash_file)
+           stash_file = strdup(global_params.stash_file);
     rblock.max_life = global_params.max_life;
     rblock.max_rlife = global_params.max_rlife;
     rblock.expiration = global_params.expiration;