summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/ldap/ldap.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index b07525d321..6bf16de8ca 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -1525,8 +1525,8 @@ PHP_FUNCTION(ldap_get_option) {
if (ldap_get_option(ldap, opt, &val)) {
RETURN_FALSE;
}
- (*retval)->type = IS_LONG;
- (*retval)->value.lval = val;
+ zval_dtor(*retval);
+ ZVAL_LONG(*retval, val);
} break;
/* options with string value */
case LDAP_OPT_HOST_NAME:
@@ -1538,10 +1538,8 @@ PHP_FUNCTION(ldap_get_option) {
if (ldap_get_option(ldap, opt, &val)) {
RETURN_FALSE;
}
- (*retval)->type = IS_STRING;
- len = strlen(val);
- (*retval)->value.str.len = len;
- (*retval)->value.str.val = estrndup(val, len);
+ zval_dtor(*retval);
+ ZVAL_STRING(*retval, val, 1);
ldap_memfree(val);
} break;
/* options not implemented