Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions src/uu/base32/src/base_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,8 @@ pub mod fast_decode {
));
}

// Encodings without partial decode (base58) are one big number, so
// they are decoded in one go after the loop, never in chunks.
if supports_partial_decode {
flush_ready_chunks(
&mut buffer,
Expand All @@ -761,14 +763,6 @@ pub mod fast_decode {
&mut decoded_buffer,
output,
)?;
} else if buffer.len() == decode_in_chunks_of_size {
decode_in_chunks_to_buffer(
supports_fast_decode_and_encode,
&buffer,
&mut decoded_buffer,
)?;
write_to_output(&mut decoded_buffer, output)?;
buffer.clear();
}
}

Expand Down
20 changes: 20 additions & 0 deletions tests/by-util/test_basenc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,26 @@ fn test_base58_large_file_no_chunking() {
// spell-checker:enable
}

#[test]
fn test_base58_decode_large_input_round_trip() {
// Decoding must not cut the input into 1024-digit chunks either.
// spell-checker:disable
let input = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. ".repeat(50);
// spell-checker:enable
let encoded = new_ucmd!()
.arg("--base58")
.pipe_in(input.clone())
.succeeds()
.stdout_move_str();
assert!(encoded.len() > 1024);

new_ucmd!()
.args(&["--base58", "-d"])
.pipe_in(encoded)
.succeeds()
.stdout_is(input);
}

#[test]
fn test_choose_last_encoding_base64() {
new_ucmd!()
Expand Down
Loading