diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-10-07 00:36:31 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-10-07 00:36:31 +0000 |
| commit | 90100e5c9028476486cc5865ce62170239f8c74a (patch) | |
| tree | 37d43f026092533e143118f71e85638097a1b89f /ext/ldap | |
| parent | 520f2839a5c9dffe9036c0209674233df059492d (diff) | |
| download | php-git-90100e5c9028476486cc5865ce62170239f8c74a.tar.gz | |
Cleaned up previous patch.
Diffstat (limited to 'ext/ldap')
| -rw-r--r-- | ext/ldap/ldap.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 4d70b6d439..fde7842afa 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1665,18 +1665,15 @@ PHP_FUNCTION(ldap_get_option) { char *val = NULL; - if (ldap_get_option(ld->link, opt, &val)) { - RETURN_FALSE; - } - if (val != NULL) { - if (*val != '\0') { - zval_dtor(*retval); - ZVAL_STRING(*retval, val, 1); + if (ldap_get_option(ld->link, opt, &val) || val == NULL || *val == '\0') { + if (val) { + ldap_memfree(val); } - ldap_memfree(val); - } else { RETURN_FALSE; } + zval_dtor(*retval); + ZVAL_STRING(*retval, val, 1); + ldap_memfree(val); } break; /* options not implemented case LDAP_OPT_SERVER_CONTROLS: |