diff options
author | Rich Megginson <rmeggins@redhat.com> | 2010-10-01 16:38:04 -0600 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2010-10-01 17:01:57 -0600 |
commit | 4f410d762b008da8e2e43e29100c2c04ff332fbb (patch) | |
tree | 6723ef832b034bda64cc691d252b42e522718bfa /ldap/servers/plugins/replication/repl_extop.c | |
parent | a82f61269d69882d19b15def70de68906ed5740e (diff) | |
download | ds-4f410d762b008da8e2e43e29100c2c04ff332fbb.tar.gz ds-4f410d762b008da8e2e43e29100c2c04ff332fbb.tar.xz ds-4f410d762b008da8e2e43e29100c2c04ff332fbb.zip |
openldap ber_init will assert if the bv->bv_val is NULL
Have to ensure that all usage of ber_init in the server checks to see if
the bv->bv_val is non-NULL before using ber_init, and return the appropriate
error if it is NULL
Also fixed a problem in dna_extend_exop - would not send the ldap result to
the client in certain error conditions
Reviewed by: nhosoi (Thanks!)
Tested on: RHEL5 x86_64
Diffstat (limited to 'ldap/servers/plugins/replication/repl_extop.c')
-rw-r--r-- | ldap/servers/plugins/replication/repl_extop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c index 527c964e..38af8ab8 100644 --- a/ldap/servers/plugins/replication/repl_extop.c +++ b/ldap/servers/plugins/replication/repl_extop.c @@ -342,7 +342,7 @@ decode_startrepl_extop(Slapi_PBlock *pb, char **protocol_oid, char **repl_root, if (NULL == extop_oid || ((strcmp(extop_oid, REPL_START_NSDS50_REPLICATION_REQUEST_OID) != 0) && (strcmp(extop_oid, REPL_START_NSDS90_REPLICATION_REQUEST_OID) != 0)) || - NULL == extop_value) + NULL == extop_value || NULL == extop_value->bv_val) { /* bogus */ rc = -1; @@ -478,7 +478,7 @@ decode_endrepl_extop(Slapi_PBlock *pb, char **repl_root) if (NULL == extop_oid || strcmp(extop_oid, REPL_END_NSDS50_REPLICATION_REQUEST_OID) != 0 || - NULL == extop_value) + NULL == extop_value || NULL == extop_value->bv_val) { /* bogus */ rc = -1; @@ -542,7 +542,7 @@ decode_repl_ext_response(struct berval *bvdata, int *response_code, PR_ASSERT(NULL != ruv_bervals); if (NULL == bvdata || NULL == response_code || NULL == ruv_bervals || - NULL == data_guid || NULL == data) + NULL == data_guid || NULL == data || NULL == bvdata->bv_val) { return_value = -1; } |