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

Jump to bottom

perf(encode): vec alloc & utf8 unchecked #180

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

perf(encode): vec alloc & utf8 unchecked #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e00cdc
perf(encode): vec alloc & utf8 unchecked
AaronO Mar 6, 2022
392ec8f
fmt
AaronO Mar 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/encode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::engine::DEFAULT_ENGINE;
use crate::engine::{Config, Engine};
use crate::PAD_BYTE;
#[cfg(any(feature = "alloc", feature = "std", test))]
use alloc::{string::String, vec};
use alloc::string::String;

///Encode arbitrary octets as base64 using the [default engine](DEFAULT_ENGINE).
///Returns a `String`.
Expand Down Expand Up @@ -56,11 +56,14 @@ pub fn encode<T: AsRef<[u8]>>(input: T) -> String {
pub fn encode_engine<E: Engine, T: AsRef<[u8]>>(input: T, engine: &E) -> String {
let encoded_size = encoded_len(input.as_ref().len(), engine.config().encode_padding())
.expect("integer overflow when calculating buffer size");
let mut buf = vec![0; encoded_size];
let mut buf = Vec::with_capacity(encoded_size);
unsafe {
buf.set_len(encoded_size);
Copy link

@jonasbb jonasbb Mar 11, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The safety documentation of set_len is pretty clear that this is UB. Namely it states

The elements at old_len..new_len must be initialized.

I think it might be safe to call after encode_with_padding. If you need uninitialized memory you probably want to use MaybeUninit.

}

encode_with_padding(input.as_ref(), &mut buf[..], engine, encoded_size);

String::from_utf8(buf).expect("Invalid UTF8")
unsafe { String::from_utf8_unchecked(buf) }
}

///Encode arbitrary octets as base64.
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
variant_size_differences,
warnings
)]
#![forbid(unsafe_code)]
// #![forbid(unsafe_code)]
#![cfg_attr(not(any(feature = "std", test)), no_std)]

#[cfg(all(feature = "alloc", not(any(feature = "std", test))))]
Expand Down