itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-02 15:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not panic when PrepareOk fails to decode (#2572)

Browse Source
This commit is contained in:
Stepan Tubanov 2023-07-01 01:14:37 +04:00 committed by GitHub
parent 8c7f541324
commit 3fdb79d03c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sqlx-mysql/src/protocol/statement/prepare_ok.rs
View File

@ -16,8 +16,14 @@ pub(crate) struct PrepareOk {
}
impl Decode<'_, Capabilities> for PrepareOk {
fn decode_with(mut buf: Bytes, _: Capabilities) -> Result<Self, Error> {
let status = buf.get_u8();
fn decode_with(buf: Bytes, _: Capabilities) -> Result<Self, Error> {
const SIZE: usize = 12;
let mut slice = buf.get(..SIZE).ok_or_else(|| {
err_protocol!("PrepareOk expected 12 bytes but got {} bytes", buf.len())
})?;
let status = slice.get_u8();
if status != 0x00 {
return Err(err_protocol!(
"expected 0x00 (COM_STMT_PREPARE_OK) but found 0x{:02x}",
@ -25,13 +31,13 @@ impl Decode<'_, Capabilities> for PrepareOk {
));
}
let statement_id = buf.get_u32_le();
let columns = buf.get_u16_le();
let params = buf.get_u16_le();
let statement_id = slice.get_u32_le();
let columns = slice.get_u16_le();
let params = slice.get_u16_le();
buf.advance(1); // reserved: string<1>
slice.advance(1); // reserved: string<1>
let warnings = buf.get_u16_le();
let warnings = slice.get_u16_le();
Ok(Self {
statement_id,