Address review comments

Author: kocsismate

ext/ldap/ldap.c

@@ -87,7 +87,6 @@ typedef struct {
 typedef struct {
 	LDAPMessage *data;
 	BerElement  *ber;
-	zval         res;
 	zend_object std;
 } ldap_result_entry;
 
@@ -217,7 +216,6 @@ static void ldap_result_entry_free_obj(zend_object *obj)
 		ber_free(entry->ber, 0);
 		entry->ber = NULL;
 	}
-	zval_ptr_dtor(&entry->res);
 
 	zend_object_std_dtor(&entry->std);
 }
@@ -233,7 +231,7 @@ static void ldap_result_entry_free_obj(zend_object *obj)
 #define VERIFY_LDAP_RESULT_OPEN(lr) \
 { \
 	if (!lr->result) { \
-		zend_throw_error(NULL, "LDAP result has already been freed"); \
+		zend_throw_error(NULL, "LDAP result has already been closed"); \
 		RETURN_THROWS(); \
 	} \
 }
@@ -1167,7 +1165,6 @@ PHP_FUNCTION(ldap_connect)
 			size_t urllen = hostlen + sizeof( "ldap://:65535" );
 
 			if (port <= 0 || port > 65535) {
-				zval_ptr_dtor(return_value);
 				zend_argument_value_error(2, "must be between 1 and 65535");
 				RETURN_THROWS();
 			}
@@ -1918,7 +1915,6 @@ PHP_FUNCTION(ldap_first_entry)
 	} else {
 		object_init_ex(return_value, ldap_result_entry_ce);
 		resultentry = Z_LDAP_RESULT_ENTRY_P(return_value);
-		ZVAL_COPY(&resultentry->res, result);
 		resultentry->data = entry;
 		resultentry->ber = NULL;
 	}
@@ -1947,7 +1943,6 @@ PHP_FUNCTION(ldap_next_entry)
 	} else {
 		object_init_ex(return_value, ldap_result_entry_ce);
 		resultentry_next = Z_LDAP_RESULT_ENTRY_P(return_value);
-		ZVAL_COPY(&resultentry_next->res, &resultentry->res);
 		resultentry_next->data = entry_next;
 		resultentry_next->ber = NULL;
 	}
@@ -3600,7 +3595,6 @@ PHP_FUNCTION(ldap_first_reference)
 	} else {
 		object_init_ex(return_value, ldap_result_entry_ce);
 		resultentry = Z_LDAP_RESULT_ENTRY_P(return_value);
-		ZVAL_COPY(&resultentry->res, result);
 		resultentry->data = entry;
 		resultentry->ber = NULL;
 	}
@@ -3629,7 +3623,6 @@ PHP_FUNCTION(ldap_next_reference)
 	} else {
 		object_init_ex(return_value, ldap_result_entry_ce);
 		resultentry_next = Z_LDAP_RESULT_ENTRY_P(return_value);
-		ZVAL_COPY(&resultentry_next->res, &resultentry->res);
 		resultentry_next->data = entry_next;
 		resultentry_next->ber = NULL;
 	}

ext/ldap/tests/ldap_search_error.phpt

@@ -39,6 +39,18 @@ try {
     echo $exception->getMessage() . "\n";
 }
 
+try {
+    ldap_search($link, [], []);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    ldap_search($link, "", []);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 ?>
 --EXPECTF--
 Warning: ldap_search(): Search: No such object in %s on line %d
@@ -49,3 +61,5 @@ bool(false)
 ldap_search(): Argument #1 ($ldap) cannot be empty
 ldap_search(): Argument #2 ($base) must have the same number of elements as the links array
 ldap_search(): Argument #3 ($filter) must have the same number of elements as the links array
+ldap_search(): Argument #2 ($base) must be of type string when argument #1 ($ldap) is an LDAP instance
+ldap_search(): Argument #3 ($filter) must be of type string when argument #1 ($ldap) is an LDAP instance