From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 3 Apr 2009 18:14:40 +0000 (+0000)
Subject: Adjust the logic in rule_an_to_ln to avoid a "can't happen" case of
X-Git-Tag: krb5-1.8-alpha1~568
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65e068c918ebdac4b01e25531fa87eff50afbdd0;p=krb5.git

Adjust the logic in rule_an_to_ln to avoid a "can't happen" case of
strchr returning null when searching for a character we know is there.
Also properly return ENOMEM if we fail to allocate selstring.

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

diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index 2c4e7047d..03b9b2d7c 100644
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -488,7 +488,7 @@ rule_an_to_ln(krb5_context context, char *rule, krb5_const_principal aname, cons
     char		*current;
     char		*fprincname;
     char		*selstring = 0;
-    int			num_comps, compind;
+    int			num_comps, compind, pos;
     size_t selstring_used;
     char		*cout;
     krb5_const krb5_data *datap;
@@ -503,16 +503,16 @@ rule_an_to_ln(krb5_context context, char *rule, krb5_const_principal aname, cons
 	 * First part.
 	 */
 	if (*current == '[') {
-	    if (sscanf(current+1,"%d:", &num_comps) == 1) {
+	    current++;
+	    if (sscanf(current,"%d:%n", &num_comps, &pos) == 1) {
 		if (num_comps == aname->length) {
 		    /*
 		     * We have a match based on the number of components.
 		     */
-		    current = strchr(current, ':');
+		    current += pos;
 		    selstring = (char *) malloc(MAX_FORMAT_BUFFER);
 		    selstring_used = 0;
-		    if (current && selstring) {
-			current++;
+		    if (selstring) {
 			cout = selstring;
 			/*
 			 * Plow through the string.
@@ -572,6 +572,8 @@ rule_an_to_ln(krb5_context context, char *rule, krb5_const_principal aname, cons
 			errout: if (kret)
 			    free(selstring);
 		    }
+		    else
+			kret = ENOMEM;
 		}
 		else
 		    kret = KRB5_LNAME_NOTRANS;