Skip to content

fix(mysql): return error instead of panic on truncated OK packet #4176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cvzx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(mysql): return error instead of panic on truncated OK packet #4176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions sqlx-mysql/src/protocol/response/ok.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ impl ProtocolDecode<'_> for OkPacket {

let affected_rows = buf.get_uint_lenenc();
let last_insert_id = buf.get_uint_lenenc();
Comment on lines 27 to 28
Copy link
Collaborator

@abonander abonander Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to move the goalposts too much, but it seems like these fields should at least be covered by the length check too.

In the long run we should probably ban use of bytes::Buf methods and instead write our own that return Result.


if buf.remaining() < 4 {
return Err(err_protocol!(
"OK_Packet too short: expected at least 4 more bytes for status+warnings, got {}",
buf.remaining()
));
}

let status = Status::from_bits_truncate(buf.get_u16_le());
let warnings = buf.get_u16_le();

Expand Down Expand Up @@ -76,3 +84,11 @@ fn test_decode_ok_packet_with_extended_info() {
assert_eq!(p.warnings, 1);
assert!(p.status.contains(Status::SERVER_STATUS_AUTOCOMMIT));
}

#[test]
fn test_decode_ok_packet_truncated() {
const DATA: &[u8] = b"\x00\x00\x00\x01";

let err = OkPacket::decode(DATA.into()).unwrap_err();
assert!(matches!(err, Error::Protocol(_)), "{err}");
}
Loading