beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 08:41:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibPDF: Fix some base-encoding-related crashes

Browse source
This commit is contained in:
Matthew Olsson 2022-03-25 08:57:52 -07:00 committed by Andreas Kling
parent 4d0f74a15c
commit 49cb040c27
Notes: sideshowbarker 2024-07-17 23:07:41 +09:00 
Author: https://github.com/mattco98
Commit: https://github.com/SerenityOS/serenity/commit/49cb040c27
Pull-request: https://github.com/SerenityOS/serenity/pull/13326
Reviewed-by: https://github.com/alimpfard
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibPDF/Encoding.cpp
View file

@ -27,14 +27,14 @@ PDFErrorOr<NonnullRefPtr<Encoding>> Encoding::from_object(Document* document, No
// Make a custom encoding
auto dict = obj->cast<DictObject>();
// FIXME: If this entry is absent, the Differences entry shall describe differences
// from an implicit base encoding. For a font program that is embedded in the
// PDF file, the implicit base encoding shall be a font program's built-in
// encoding [...]. Otherwise, for a nonsymbolic font, it shall be
// StandardEncoding, and for a symbolic font, it shall be the font's built-in
// encoding.
auto base_encoding_obj = MUST(dict->get_object(document, CommonNames::BaseEncoding));
auto base_encoding = TRY(Encoding::from_object(document, base_encoding_obj));
RefPtr<Encoding> base_encoding;
if (dict->contains(CommonNames::BaseEncoding)) {
auto base_encoding_obj = MUST(dict->get_object(document, CommonNames::BaseEncoding));
base_encoding = TRY(Encoding::from_object(document, base_encoding_obj));
} else {
base_encoding = Encoding::standard_encoding();
}
auto encoding = adopt_ref(*new Encoding());
// Build a String -> Character mapping for handling the differences map
@ -62,8 +62,10 @@ PDFErrorOr<NonnullRefPtr<Encoding>> Encoding::from_object(Document* document, No
auto name = object->cast<NameObject>()->name();
auto character = base_encoding_name_mapping.get(name);
VERIFY(character.has_value());
encoding->m_descriptors.set(current_code_point, character.value());
// FIXME: This should always have a value. This does cause crashes in certain
// documents, so we must be missing something here.
if (character.has_value())
encoding->m_descriptors.set(current_code_point, character.value());
current_code_point++;
}