RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-08-07 18:07:47 +00:00
Code Issues Activity Actions

AK+Userland: Make AK::decode_base64 return ErrorOr

Browse source
This commit is contained in:
Sam Atkins 2022-01-20 17:18:17 +00:00 • committed by Andreas Kling
parent f590cd1850
commit c388a879d7
11 changed files with 31 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Applications/Mail/MailWidget.cpp
View file

@ -499,7 +499,9 @@ void MailWidget::selected_email_to_load()
if (selected_alternative_encoding.equals_ignoring_case("7bit") || selected_alternative_encoding.equals_ignoring_case("8bit")) {
decoded_data = encoded_data;
} else if (selected_alternative_encoding.equals_ignoring_case("base64")) {
decoded_data = decode_base64(encoded_data).value_or(ByteBuffer());
auto decoded_base64 = decode_base64(encoded_data);
if (!decoded_base64.is_error())
decoded_data = decoded_base64.release_value();
} else if (selected_alternative_encoding.equals_ignoring_case("quoted-printable")) {
decoded_data = IMAP::decode_quoted_printable(encoded_data);
} else {

7
Userland/Applications/PixelPaint/Image.cpp
View file

@ -88,11 +88,8 @@ ErrorOr<NonnullRefPtr<Image>> Image::try_create_from_pixel_paint_json(JsonObject
auto name = layer_object.get("name").as_string();
auto bitmap_base64_encoded = layer_object.get("bitmap").as_string();
auto bitmap_data = decode_base64(bitmap_base64_encoded);
if (!bitmap_data.has_value())
return Error::from_string_literal("Base64 decode failed"sv);
auto bitmap = TRY(try_decode_bitmap(bitmap_data.value()));
auto bitmap_data = TRY(decode_base64(bitmap_base64_encoded));
auto bitmap = TRY(try_decode_bitmap(bitmap_data));
auto layer = TRY(Layer::try_create_with_bitmap(*image, move(bitmap), name));
auto width = layer_object.get("width").to_i32();