mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ITS#3413, bad variable re-use

Browse Source
This commit is contained in:
Howard Chu 2004-12-03 03:39:27 +00:00
parent a4f3a45b6d
commit 5a5fc55a13
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/slapd/config.c
View File

@ -322,6 +322,7 @@ int parse_config_table(ConfigTable *Conf, ConfigArgs *c) {
c->value_int = c->value_long = c->value_ber_t = 0; c->value_int = c->value_long = c->value_ber_t = 0;
c->value_string = NULL; c->value_string = NULL;
if(arg_type & ARGS_NUMERIC) { if(arg_type & ARGS_NUMERIC) {
int j;
iarg = 0; larg = 0; barg = 0; iarg = 0; larg = 0; barg = 0;
switch(arg_type & ARGS_NUMERIC) { switch(arg_type & ARGS_NUMERIC) {
case ARG_INT: iarg = atoi(c->argv[1]); break; case ARG_INT: iarg = atoi(c->argv[1]); break;
@ -340,9 +341,9 @@ int parse_config_table(ConfigTable *Conf, ConfigArgs *c) {
} }
break; break;
} }
i = (arg_type & ARG_NONZERO) ? 1 : 0; j = (arg_type & ARG_NONZERO) ? 1 : 0;
rc = (Conf == SystemConfiguration) ? ((arg_type & ARG_SPECIAL) && (larg < index_substr_if_maxlen)) : 0; rc = (Conf == SystemConfiguration) ? ((arg_type & ARG_SPECIAL) && (larg < index_substr_if_maxlen)) : 0;
if(iarg < i || larg < i || barg < i || rc) { if(iarg < j || larg < j || barg < j || rc) {
larg = larg ? larg : (barg ? barg : iarg); larg = larg ? larg : (barg ? barg : iarg);
Debug(LDAP_DEBUG_CONFIG, "%s: line %lu: " , c->fname, c->lineno, 0); Debug(LDAP_DEBUG_CONFIG, "%s: line %lu: " , c->fname, c->lineno, 0);
Debug(LDAP_DEBUG_CONFIG, "invalid %s value (%ld) in <%s> line\n", Conf[i].what, larg, Conf[i].name); Debug(LDAP_DEBUG_CONFIG, "invalid %s value (%ld) in <%s> line\n", Conf[i].what, larg, Conf[i].name);