beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibPDF: Don't assert on named simple color space

Browse source 
If a PDF uses `/CustomName cs` and `/CustomName` then points at just a
name like `/DeviceGray` instead of an array, that's ok. Just using
`/DeviceGray cs` is simpler, so this extra level of indirection is
somewhat rare in practice, but it's valid and it does happen. So support
it.

We already have a helper that does the right thing that we just need to
call.

Together with #21524 and #21525, reduces number of crashes on 300 random
PDFs from the web (the first 300 from 0000.zip from
https://pdfa.org/new-large-scale-pdf-corpus-now-publicly-available/)
from 29 (9%) to 25 (8%).
This commit is contained in:
Nico Weber 2023-10-21 10:42:16 -04:00 committed by Andreas Kling
parent 3dd68f6026
commit 1a58fee0fd
Notes: sideshowbarker 2024-07-17 06:40:35 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/1a58fee0fd
Pull-request: https://github.com/SerenityOS/serenity/pull/21530
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibPDF/Renderer.cpp
View file

@ -975,12 +975,16 @@ PDFErrorOr<NonnullRefPtr<ColorSpace>> Renderer::get_color_space_from_resources(V
dbgln("missing key {}", color_space_name); dbgln("missing key {}", color_space_name);
return Error::rendering_unsupported_error("Missing entry for color space name"); return Error::rendering_unsupported_error("Missing entry for color space name");
} }
auto color_space_array = TRY(color_space_resource_dict->get_array(m_document, color_space_name)); return get_color_space_from_document(TRY(color_space_resource_dict->get_object(m_document, color_space_name)));
return ColorSpace::create(m_document, color_space_array);
} }
PDFErrorOr<NonnullRefPtr<ColorSpace>> Renderer::get_color_space_from_document(NonnullRefPtr<Object> color_space_object) PDFErrorOr<NonnullRefPtr<ColorSpace>> Renderer::get_color_space_from_document(NonnullRefPtr<Object> color_space_object)
{ {
// "A color space is defined by an array object whose first element is a name object identifying the color space family.
// The remaining array elements, if any, are parameters that further characterize the color space;
// their number and types vary according to the particular family.
// For families that do not require parameters, the color space can be specified simply by the family name itself instead of an array."
// Pattern cannot be a name in these cases // Pattern cannot be a name in these cases
if (color_space_object->is<NameObject>()) { if (color_space_object->is<NameObject>()) {
return ColorSpace::create(color_space_object->cast<NameObject>()->name()); return ColorSpace::create(color_space_object->cast<NameObject>()->name());