Handle freeing of fetched data at call site

Author: Girgias

ext/pdo/pdo_stmt.c

@@ -730,8 +730,6 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 		return true;
 	}
 
-	RETVAL_FALSE;
-
 	switch (how) {
 		case PDO_FETCH_USE_DEFAULT:
 		case PDO_FETCH_ASSOC:
@@ -852,8 +850,6 @@ 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);
-			ZVAL_NULL(return_value);
 			return false;
 		}
 		column_index_to_fetch++;
@@ -925,20 +921,14 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
 			case PDO_FETCH_FUNC:
 				ZVAL_COPY_VALUE(&fetch_function_params[fetch_function_param_num++], &val);
 				break;
-
-			default:
-				zval_ptr_dtor(&val);
-				zend_value_error("Fetch mode must be a bitmask of PDO::FETCH_* constants");
-				return 0;
+			EMPTY_SWITCH_DEFAULT_CASE();
 		}
 	}
 
 	/* Run constructor for objects if not already run and not unserialized */
 	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);
-			RETVAL_FALSE;
 			return false;
 		}
 	} else if (how == PDO_FETCH_FUNC) {
@@ -1046,6 +1036,7 @@ 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;
 	}
@@ -1083,6 +1074,7 @@ 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;
 	}
@@ -1254,8 +1246,14 @@ 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)));
-		PDO_HANDLE_STMT_ERR();
-		return;
+		/* 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();
+		}
 	}
 
 	// Need to handle the "broken" PDO_FETCH_GROUP|PDO_FETCH_UNIQUE fetch case
@@ -1287,7 +1285,15 @@ PHP_METHOD(PDOStatement, fetchAll)
 	stmt->fetch.cls.ce = old_ce;
 	stmt->fetch.cls.ctor_args = old_ctor_args;
 
-	PDO_HANDLE_STMT_ERR();
+	/* 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);
+		}
+		RETURN_EMPTY_ARRAY();
+	}
 }
 /* }}} */