summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2010-08-12 17:50:04 -0600
committerRich Megginson <rmeggins@redhat.com>2010-08-31 13:35:54 -0600
commitb5431929adfc464bb4d2ad16b012e2dc5deacd7e (patch)
treea5657aa72b71f3464f18ddacfa6daefca23e0061
parent200a0ec34a7225ca3c2dd55b4a29f55793ced5f8 (diff)
downloadds-b5431929adfc464bb4d2ad16b012e2dc5deacd7e.tar.gz
ds-b5431929adfc464bb4d2ad16b012e2dc5deacd7e.tar.xz
ds-b5431929adfc464bb4d2ad16b012e2dc5deacd7e.zip
ber_printf 'o' cannot handle NULL bv_val
The value passed to the char * argument to ber_printf 'o' must not be a NULL, even if the bv_len argument is 0. An empty string "" must be passed instead.
-rw-r--r--ldap/servers/slapd/result.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/servers/slapd/result.c b/ldap/servers/slapd/result.c
index 8e1e3187..ca42de52 100644
--- a/ldap/servers/slapd/result.c
+++ b/ldap/servers/slapd/result.c
@@ -240,7 +240,7 @@ check_and_send_extended_result(Slapi_PBlock *pb, ber_tag_t tag, BerElement *ber)
if (rc != LBER_ERROR && exop_value != NULL) {
rc = ber_printf( ber, "to",
LDAP_TAG_EXOP_RES_VALUE,
- exop_value->bv_val,
+ exop_value->bv_val ? exop_value->bv_val : "",
exop_value->bv_len );
}
}
@@ -263,7 +263,7 @@ check_and_send_SASL_response(Slapi_PBlock *pb, ber_tag_t tag, BerElement *ber, C
if ( bind_ret_saslcreds != NULL ) {
rc = ber_printf( ber, "to",
LDAP_TAG_SASL_RES_CREDS,
- bind_ret_saslcreds->bv_val,
+ bind_ret_saslcreds->bv_val ? bind_ret_saslcreds->bv_val : "",
bind_ret_saslcreds->bv_len );
}
}