holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bad slice into erroring utf-8 buffer (#872)

Browse Source
This commit is contained in:
JT
2022-01-28 15:32:46 -05:00
committed by GitHub
parent 020ad24b25
commit 86eeb4a5e7
8 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-protocol/src/value/mod.rs
View File

@ -175,11 +175,14 @@ impl Value {
Value::Binary { val, .. } => Ok(match std::str::from_utf8(val) {
Ok(s) => s.to_string(),
Err(_) => {
// println!("{:?}", e);
// println!("bytes: {}", pretty_hex::pretty_hex(&val));
// panic!("let's see it");
return Err(ShellError::CantConvert(
"binary".into(),
"string".into(),
"binary".into(),
self.span()?,
))
));
}
}),
x => Err(ShellError::CantConvert(
@ -203,8 +206,8 @@ impl Value {
},
Err(_) => {
return Err(ShellError::CantConvert(
"binary".into(),
"string".into(),
"binary".into(),
self.span()?,
))
}
@ -299,7 +302,7 @@ impl Value {
match self {
Value::Int { val, .. } => Ok(*val),
x => Err(ShellError::CantConvert(
"float".into(),
"integer".into(),
x.get_type().to_string(),
self.span()?,
)),

18
crates/nu-protocol/src/value/stream.rs
View File

@ -19,13 +19,14 @@ impl RawStream {
pub fn new(
stream: Box<dyn Iterator<Item = Result<Vec<u8>, ShellError>> + Send + 'static>,
ctrlc: Option<Arc<AtomicBool>>,
span: Span,
) -> Self {
Self {
stream,
leftover: vec![],
ctrlc,
is_binary: false,
span: Span::new(0, 0),
span,
}
}
@ -63,8 +64,10 @@ impl Iterator for RawStream {
match self.stream.next() {
Some(buffer) => match buffer {
Ok(mut v) => {
while let Some(b) = self.leftover.pop() {
v.insert(0, b);
if !self.leftover.is_empty() {
while let Some(b) = self.leftover.pop() {
v.insert(0, b);
}
}
Some(Ok(Value::Binary {
val: v,
@ -81,8 +84,10 @@ impl Iterator for RawStream {
match self.stream.next() {
Some(buffer) => match buffer {
Ok(mut v) => {
while let Some(b) = self.leftover.pop() {
v.insert(0, b);
if !self.leftover.is_empty() {
while let Some(b) = self.leftover.pop() {
v.insert(0, b);
}
}
match String::from_utf8(v.clone()) {
@ -113,8 +118,7 @@ impl Iterator for RawStream {
// Okay, we have a tiny bit of error at the end of the buffer. This could very well be
// a character that spans two frames. Since this is the case, remove the error from
// the current frame an dput it in the leftover buffer.
self.leftover =
v[(err.utf8_error().valid_up_to() + 1)..].to_vec();
self.leftover = v[err.utf8_error().valid_up_to()..].to_vec();
let buf = v[0..err.utf8_error().valid_up_to()].to_vec();