From: Theodore Tso <tytso@mit.edu>
Date: Wed, 12 Mar 1997 06:25:34 +0000 (+0000)
Subject: Check to see if the global_param's stash file is non-NULL before
X-Git-Tag: krb5-1.1-beta1~1194
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36bf6333c49cdd3276562d831030c9f8c89a3401;p=krb5.git

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 9a653a391..803d5deb5 100644
--- 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 238a187cf..90fb001e5 100644
--- 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;