Skip to content

Commit 29549b1

Browse files
authored
fix(mysql): validate parameter count for prepared statements (#3857)
* fix(mysql): validate parameter count for prepared statements Add validation to ensure the number of provided parameters matches the expected count for MySQL prepared statements. This prevents protocol errors by returning an error if the counts do not match before sending the statement for execution. * refactor(mysql): use err_protocol macro for error creation Replace direct Error::Protocol(format!()) calls with err_protocol! macro in MySQL connection executor. * test(mysql): add parameter count validation tests - Add test for too few parameters provided to query - Add test for too many parameters provided to query - Add test for parameters provided when none expected - All tests verify Error::Protocol is returned for mismatches Covers cases for issue #3774 parameter validation fix.
1 parent 8ebc6f9 commit 29549b1

File tree

2 files changed

+67
-0
lines changed

2 files changed

+67
-0
lines changed

sqlx-mysql/src/connection/executor.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,16 @@ impl MySqlConnection {
124124
.get_or_prepare_statement(sql)
125125
.await?;
126126

127+
if arguments.types.len() != metadata.parameters {
128+
return Err(
129+
err_protocol!(
130+
"prepared statement expected {} parameters but {} parameters were provided",
131+
metadata.parameters,
132+
arguments.types.len()
133+
)
134+
);
135+
}
136+
127137
// https://dev.mysql.com/doc/internals/en/com-stmt-execute.html
128138
self.inner.stream
129139
.send_packet(StatementExecute {
@@ -138,6 +148,16 @@ impl MySqlConnection {
138148
.prepare_statement(sql)
139149
.await?;
140150

151+
if arguments.types.len() != metadata.parameters {
152+
return Err(
153+
err_protocol!(
154+
"prepared statement expected {} parameters but {} parameters were provided",
155+
metadata.parameters,
156+
arguments.types.len()
157+
)
158+
);
159+
}
160+
141161
// https://dev.mysql.com/doc/internals/en/com-stmt-execute.html
142162
self.inner.stream
143163
.send_packet(StatementExecute {

tests/mysql/error.rs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,50 @@ async fn it_fails_with_invalid_save_point_statement() -> anyhow::Result<()> {
100100

101101
Ok(())
102102
}
103+
104+
#[sqlx_macros::test]
105+
async fn it_fails_with_parameter_count_mismatch_too_few() -> anyhow::Result<()> {
106+
let mut conn = new::<MySql>().await?;
107+
let res: Result<_, sqlx::Error> =
108+
sqlx::query("SELECT * FROM tweet WHERE id = ? AND owner_id = ?")
109+
.bind(1_i64)
110+
.execute(&mut conn)
111+
.await;
112+
113+
let err = res.unwrap_err();
114+
115+
assert!(matches!(err, Error::Protocol(_)), "{err}");
116+
117+
Ok(())
118+
}
119+
120+
#[sqlx_macros::test]
121+
async fn it_fails_with_parameter_count_mismatch_too_many() -> anyhow::Result<()> {
122+
let mut conn = new::<MySql>().await?;
123+
let res: Result<_, sqlx::Error> = sqlx::query("SELECT * FROM tweet WHERE id = ?")
124+
.bind(1_i64)
125+
.bind(2_i64)
126+
.execute(&mut conn)
127+
.await;
128+
129+
let err = res.unwrap_err();
130+
131+
assert!(matches!(err, Error::Protocol(_)), "{err}");
132+
133+
Ok(())
134+
}
135+
136+
#[sqlx_macros::test]
137+
async fn it_fails_with_parameter_count_mismatch_zero_expected() -> anyhow::Result<()> {
138+
let mut conn = new::<MySql>().await?;
139+
let res: Result<_, sqlx::Error> = sqlx::query("SELECT COUNT(*) FROM tweet")
140+
.bind(1_i64)
141+
.execute(&mut conn)
142+
.await;
143+
144+
let err = res.unwrap_err();
145+
146+
assert!(matches!(err, Error::Protocol(_)), "{err}");
147+
148+
Ok(())
149+
}

0 commit comments

Comments
 (0)