Introduce PDO_HANDLE_STMT_ERR_EX

Author: Girgias

ext/pdo/pdo_stmt.c

@@ -1276,14 +1276,7 @@ PHP_METHOD(PDOStatement, fetchAll)
 	stmt->fetch.cls.ce = old_ce;
 	stmt->fetch.cls.ctor_args = old_ctor_args;
 
-	/* 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_EX(zval_ptr_dtor(return_value); RETVAL_EMPTY_ARRAY(););
 }
 /* }}} */
 

ext/pdo/php_pdo_error.h

@@ -34,6 +34,7 @@ PDO_API void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt);
 	memcpy(stmt->error_code, PDO_ERR_NONE, sizeof(PDO_ERR_NONE)); \
 } while (0)
 #define PDO_HANDLE_DBH_ERR()    if (strcmp(dbh->error_code, PDO_ERR_NONE)) { pdo_handle_error(dbh, NULL); }
-#define PDO_HANDLE_STMT_ERR()   if (strcmp(stmt->error_code, PDO_ERR_NONE)) { pdo_handle_error(stmt->dbh, stmt); }
+#define PDO_HANDLE_STMT_ERR_EX(cleanup_instruction)   if (strcmp(stmt->error_code, PDO_ERR_NONE) != 0) {  cleanup_instruction pdo_handle_error(stmt->dbh, stmt); }
+#define PDO_HANDLE_STMT_ERR() PDO_HANDLE_STMT_ERR_EX(;)
 
 #endif /* PHP_PDO_ERROR_H */