Skip to content

Handle empty input as per rfc4648 #11

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

Open
fbernier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle empty input as per rfc4648 #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ pub enum DecodeError {
/// The decoded number cannot fit into a [`u128`].
ArithmeticOverflow,

/// The encoded input is an empty string.
EmptyInput,

/// The encoded input contains the given invalid byte at the given index.
InvalidBase62Byte(u8, usize),
}
Expand All @@ -53,7 +50,6 @@ impl core::fmt::Display for DecodeError {
DecodeError::ArithmeticOverflow => {
f.write_str("Decoded number cannot fit into a `u128`")
}
DecodeError::EmptyInput => f.write_str("Encoded input is an empty string"),
DecodeError::InvalidBase62Byte(ch, idx) => {
use core::fmt::Write;

Expand Down Expand Up @@ -346,7 +342,7 @@ macro_rules! internal_decoder_fn {
($fn_name:ident, $numeric_start_value:literal, $uppercase_start_value:literal, $lowercase_start_value:literal) => {
fn $fn_name(mut input: &[u8]) -> Result<u128, DecodeError> {
if input.is_empty() {
return Err(DecodeError::EmptyInput);
return Ok(0);
}

// Remove leading zeroes
Expand Down Expand Up @@ -825,7 +821,7 @@ mod tests {

quickcheck! {
fn decode_bad(input: Vec<u8>) -> TestResult {
if !input.is_empty() && input.iter().all(|ch| ch.is_ascii_alphanumeric()) {
if input.iter().all(|ch| ch.is_ascii_alphanumeric()) {
TestResult::discard()
} else {
TestResult::from_bool(decode(&input).is_err())
Expand All @@ -835,7 +831,7 @@ mod tests {

quickcheck! {
fn decode_good(input: Vec<u8>) -> TestResult {
if !input.is_empty() && input.iter().all(|ch| ch.is_ascii_alphanumeric()) {
if input.iter().all(|ch| ch.is_ascii_alphanumeric()) {
TestResult::from_bool(decode(&input).is_ok())
} else {
TestResult::discard()
Expand Down Expand Up @@ -882,7 +878,7 @@ mod tests {

#[test]
fn test_decode_empty_input() {
assert_eq!(decode(""), Err(DecodeError::EmptyInput));
assert_eq!(decode(""), Ok(0));
}

#[test]
Expand Down Expand Up @@ -967,7 +963,7 @@ mod tests {

#[test]
fn test_decode_alternative_empty_input() {
assert_eq!(decode_alternative(""), Err(DecodeError::EmptyInput));
assert_eq!(decode_alternative(""), Ok(0));
}

#[test]
Expand Down