bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid panicking branch in append_to_string

Browse source
This commit is contained in:
Benoît du Garreau 2024-04-10 19:16:31 +02:00
parent 23211b638a
commit 2e3ee23022
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/std/src/io/mod.rs
View file

@ -384,7 +384,10 @@ where
{ {
let mut g = Guard { len: buf.len(), buf: buf.as_mut_vec() }; let mut g = Guard { len: buf.len(), buf: buf.as_mut_vec() };
let ret = f(g.buf); let ret = f(g.buf);
if str::from_utf8(&g.buf[g.len..]).is_err() {
// SAFETY: the caller promises to only append data to `buf`
let appended = g.buf.get_unchecked(g.len..);
if str::from_utf8(appended).is_err() {
ret.and_then(|_| Err(Error::INVALID_UTF8)) ret.and_then(|_| Err(Error::INVALID_UTF8))
} else { } else {
g.len = g.buf.len(); g.len = g.buf.len();