Commit fccfc418 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#9014 fix component match parsing errors

parent e853455c
......@@ -347,7 +347,7 @@ get_comp_filter( Operation* op, struct berval* bv,
return rc;
}
rc = parse_comp_filter( op, &cav, filt, text );
bv->bv_val = cav.cav_ptr;
/* bv->bv_val = cav.cav_ptr; */
return rc;
}
......@@ -1074,7 +1074,7 @@ parse_comp_filter( Operation* op, ComponentAssertionValue* cav,
*/
ber_tag_t tag;
int err;
int err = LDAP_SUCCESS;
ComponentFilter f;
/* TAG : item, and, or, not in RFC 4515 */
tag = strip_cav_tag( cav );
......@@ -1084,10 +1084,11 @@ parse_comp_filter( Operation* op, ComponentAssertionValue* cav,
return LDAP_PROTOCOL_ERROR;
}
if ( tag != LDAP_COMP_FILTER_NOT )
strip_cav_str( cav, "{");
err = LDAP_SUCCESS;
if ( tag != LDAP_COMP_FILTER_NOT ) {
err = strip_cav_str( cav, "{");
if ( err )
goto invalid;
}
f.cf_next = NULL;
f.cf_choice = tag;
......@@ -1161,13 +1162,14 @@ parse_comp_filter( Operation* op, ComponentAssertionValue* cav,
break;
}
invalid:
if ( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {
*text = "Component Filter Syntax Error";
return err;
}
if ( tag != LDAP_COMP_FILTER_NOT )
strip_cav_str( cav, "}");
err = strip_cav_str( cav, "}");
if ( err == LDAP_SUCCESS ) {
if ( op ) {
......
......@@ -282,6 +282,9 @@ certificateValidate( Syntax *syntax, struct berval *in )
ber_len_t len;
ber_int_t version = SLAP_X509_V1;
if ( BER_BVISNULL( in ) || BER_BVISEMPTY( in ))
return LDAP_INVALID_SYNTAX;
ber_init2( ber, in, LBER_USE_DER );
tag = ber_skip_tag( ber, &len ); /* Signed wrapper */
if ( tag != LBER_SEQUENCE ) return LDAP_INVALID_SYNTAX;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment