Skip to content
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

fix(postgres): don't panic if M or C Notice fields are not UTF-8 #3346

Merged
merged 3 commits into from
Jul 16, 2024
Merged

fix(postgres): don't panic if M or C Notice fields are not UTF-8 #3346

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
362ca98
fix(postgres): don't panic if `M` or `C` Notice fields are not UTF-8
YgorSouza Jul 12, 2024
6e915f2
Revert "fix(postgres): don't panic if `M` or `C` Notice fields are no…
YgorSouza Jul 16, 2024
7aa6ca1
Check that Notice M and C fields are valid UTF-8
YgorSouza Jul 16, 2024
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
6 changes: 6 additions & 0 deletions sqlx-postgres/src/message/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,19 @@ impl Decode<'_> for Notice {
}

b'M' => {
_ = from_utf8(&buf[v.0 as usize..v.1 as usize])
.map_err(|_| notice_protocol_err())?;
message = v;
}

b'C' => {
_ = from_utf8(&buf[v.0 as usize..v.1 as usize])
.map_err(|_| notice_protocol_err())?;
code = v;
}

// If more fields are added, make sure to check that they are valid UTF-8,
// otherwise the get_cached_str method will panic.
_ => {}
}
}
Expand Down
Loading