Fix bad refactoring

Author: Girgias

ext/pdo/pdo_stmt.c

@@ -789,7 +789,6 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 					bool failed = pdo_call_fetch_object_constructor(ce->constructor, ctor_arguments, return_value);
 					if (UNEXPECTED(failed)) {
 						zval_ptr_dtor(return_value);
-						RETVAL_FALSE;
 						return false;
 					}
 				}
@@ -807,9 +806,6 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 
 			ZVAL_OBJ_COPY(return_value, stmt->fetch.into);
 
-			if (Z_OBJ_P(return_value)->ce == ZEND_STANDARD_CLASS_DEF_PTR) {
-				how = PDO_FETCH_OBJ;
-			}
 			/* We want the behaviour of fetching into an object to be called from the global scope rather
 			 * than the object scope */
 			ce = NULL;
@@ -850,6 +846,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 		zval_ptr_dtor(&unserialization_string);
 		if (unserialize_res == FAILURE) {
 			pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class");
+			zval_ptr_dtor(return_value);
 			return false;
 		}
 		column_index_to_fetch++;
@@ -929,6 +926,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 	if (how == PDO_FETCH_CLASS && ce->constructor && !(flags & (PDO_FETCH_PROPS_LATE | PDO_FETCH_SERIALIZE))) {
 		bool failed = pdo_call_fetch_object_constructor(ce->constructor, ctor_arguments, return_value);
 		if (UNEXPECTED(failed)) {
+			zval_ptr_dtor(return_value);
 			return false;
 		}
 	} else if (how == PDO_FETCH_FUNC) {
@@ -1036,7 +1034,6 @@ PHP_METHOD(PDOStatement, fetch)
 		return;
 	}
 	if (!do_fetch(stmt, return_value, how, ori, off, NULL)) {
-		zval_ptr_dtor(return_value);
 		PDO_HANDLE_STMT_ERR();
 		RETURN_FALSE;
 	}
@@ -1074,7 +1071,6 @@ PHP_METHOD(PDOStatement, fetchObject)
 	stmt->fetch.cls.ctor_args = ctor_args;
 
 	if (!do_fetch(stmt, return_value, PDO_FETCH_CLASS, PDO_FETCH_ORI_NEXT, /* offset */ 0, NULL)) {
-		zval_ptr_dtor(return_value);
 		PDO_HANDLE_STMT_ERR();
 		RETVAL_FALSE;
 	}
@@ -1247,14 +1243,8 @@ PHP_METHOD(PDOStatement, fetchAll)
 
 	if (fetch_mode == PDO_FETCH_KEY_PAIR) {
 		while (pdo_do_key_pair_fetch(stmt, PDO_FETCH_ORI_NEXT, /* offset */ 0, Z_ARRVAL_P(return_value)));
-		/* Inline PDO_HANDLE_STMT_ERR(); as we need to free the return value */
-		if (UNEXPECTED(EG(exception) || strcmp(stmt->error_code, PDO_ERR_NONE) != 0)) {
-			zval_ptr_dtor(return_value);
-			if (strcmp(stmt->error_code, PDO_ERR_NONE) != 0) {
-				pdo_handle_error(stmt->dbh, stmt);
-			}
-			RETURN_EMPTY_ARRAY();
-		}
+		PDO_HANDLE_STMT_ERR();
+		return;
 	}
 
 	// Need to handle the "broken" PDO_FETCH_GROUP|PDO_FETCH_UNIQUE fetch case
@@ -1288,7 +1278,6 @@ PHP_METHOD(PDOStatement, fetchAll)
 
 	/* Inline PDO_HANDLE_STMT_ERR(); as we need to free the return value */
 	if (UNEXPECTED(EG(exception) || strcmp(stmt->error_code, PDO_ERR_NONE) != 0)) {
-		zval_ptr_dtor(&data);
 		zval_ptr_dtor(return_value);
 		if (strcmp(stmt->error_code, PDO_ERR_NONE) != 0) {
 			pdo_handle_error(stmt->dbh, stmt);