From: Tom Yu <tlyu@mit.edu>
Date: Mon, 28 Sep 2009 20:27:13 +0000 (+0000)
Subject: pull up r22402 from trunk
X-Git-Tag: krb5-1.7.1-beta1~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd4e7e2807550d0af5c7dbb715212832ecd0f499;p=krb5.git

pull up r22402 from trunk
 ------------------------------------------------------------------------
 r22402 | epeisach | 2009-06-05 23:55:44 -0400 (Fri, 05 Jun 2009) | 7 lines

 ticket: 6508
 subject: kadm5int_acl_parse_restrictions could ref uninitialized variable

 The variable sp is never initialized. If the first argument to the
 function is null, the code falls through to freeing sp if valid.
 However, sp is never set.

ticket: 6508
version_fixed: 1.7.1
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22796 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c
index 9471d0ac0..ec6fd9dd3 100644
--- a/src/lib/kadm5/srv/server_acl.c
+++ b/src/lib/kadm5/srv/server_acl.c
@@ -278,7 +278,7 @@ kadm5int_acl_parse_restrictions(s, rpp)
     char		*s;
     restriction_t	**rpp;
 {
-    char		*sp, *tp, *ap;
+    char		*sp = NULL, *tp, *ap;
     static const char	*delims = "\t\n\f\v\r ,";
     krb5_deltat		dt;
     krb5_flags		flag;