Rollup merge of #78499 - SkiFire13:fix-string-retain, r=m-ou-se
Prevent String::retain from creating non-utf8 strings when abusing panic Fixes #78498 The idea is the same as `Vec::drain`, set the len to 0 so that nobody can observe the broken invariant if it escapes the function (in this case if `f` panics)
This commit is contained in:
commit
48c4afbf9c
@ -1235,6 +1235,10 @@ pub fn retain<F>(&mut self, mut f: F)
|
||||
let mut del_bytes = 0;
|
||||
let mut idx = 0;
|
||||
|
||||
unsafe {
|
||||
self.vec.set_len(0);
|
||||
}
|
||||
|
||||
while idx < len {
|
||||
let ch = unsafe { self.get_unchecked(idx..len).chars().next().unwrap() };
|
||||
let ch_len = ch.len_utf8();
|
||||
@ -1255,10 +1259,8 @@ pub fn retain<F>(&mut self, mut f: F)
|
||||
idx += ch_len;
|
||||
}
|
||||
|
||||
if del_bytes > 0 {
|
||||
unsafe {
|
||||
self.vec.set_len(len - del_bytes);
|
||||
}
|
||||
unsafe {
|
||||
self.vec.set_len(len - del_bytes);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
use std::borrow::Cow;
|
||||
use std::collections::TryReserveError::*;
|
||||
use std::ops::Bound::*;
|
||||
use std::panic;
|
||||
|
||||
pub trait IntoCow<'a, B: ?Sized>
|
||||
where
|
||||
@ -378,6 +379,20 @@ fn test_retain() {
|
||||
|
||||
s.retain(|_| false);
|
||||
assert_eq!(s, "");
|
||||
|
||||
let mut s = String::from("0è0");
|
||||
let _ = panic::catch_unwind(panic::AssertUnwindSafe(|| {
|
||||
let mut count = 0;
|
||||
s.retain(|_| {
|
||||
count += 1;
|
||||
match count {
|
||||
1 => false,
|
||||
2 => true,
|
||||
_ => panic!(),
|
||||
}
|
||||
});
|
||||
}));
|
||||
assert!(std::str::from_utf8(s.as_bytes()).is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
Loading…
Reference in New Issue
Block a user