MFH: Cleaned up previous patch.

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index d980e4e52a6514c9e1827367563b462d5a194738..49e3125b93b29b696cbd62c5631062d0da790c7f 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -1615,18 +1615,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: