name2_tree may be NULL

and do checks if there's only one sub-section
FreeRADIUS · Feb 18, 2014 · f1ddf56 · f1ddf56
1 parent 633ab61
commit f1ddf56
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/main/conffile.c b/src/main/conffile.c
@@ -2390,6 +2390,16 @@ CONF_SECTION *cf_section_sub_find_name2(CONF_SECTION const *cs,
 		name1cs = cf_section_sub_find(cs, name1);
 		if (!name1cs) return NULL;
 
+		if (!name1cs->name2_tree) {
+			if (!name1cs->name2 && name2) return NULL;
+			if (name1cs->name2 && !name2) return NULL;
+
+			if (strcmp(name1cs->name2, name2) == 0) {
+				return name1cs;
+			}
+			return NULL;
+		}
+
 		mycs.name1 = name1;
 		mycs.name2 = name2;