mirror of
https://github.com/RGBCube/serenity
synced 2025-07-29 07:17:35 +00:00
LibPDF: Ignore whitespace in the ASCII hex filter
The spec tells us that any amount of whitespace may appear between the hex digits and that it should just be ignored.
This commit is contained in:
parent
29796f8f5e
commit
320f5f91ab
1 changed files with 23 additions and 19 deletions
|
@ -56,29 +56,33 @@ PDFErrorOr<ByteBuffer> Filter::decode(ReadonlyBytes bytes, DeprecatedFlyString c
|
||||||
|
|
||||||
PDFErrorOr<ByteBuffer> Filter::decode_ascii_hex(ReadonlyBytes bytes)
|
PDFErrorOr<ByteBuffer> Filter::decode_ascii_hex(ReadonlyBytes bytes)
|
||||||
{
|
{
|
||||||
if (bytes.size() % 2 == 0)
|
ByteBuffer output;
|
||||||
return TRY(decode_hex(bytes));
|
|
||||||
|
|
||||||
// FIXME: Integrate this padding into AK/Hex?
|
bool have_read_high_nibble = false;
|
||||||
|
u8 high_nibble = 0;
|
||||||
auto output = TRY(ByteBuffer::create_zeroed(bytes.size() / 2 + 1));
|
for (u8 byte : bytes) {
|
||||||
|
// 3.3.1 ASCIIHexDecode Filter
|
||||||
for (size_t i = 0; i < bytes.size() / 2; ++i) {
|
// All white-space characters [...] are ignored.
|
||||||
auto const c1 = decode_hex_digit(static_cast<char>(bytes[i * 2]));
|
// FIXME: Any other characters cause an error.
|
||||||
if (c1 >= 16)
|
if (is_ascii_hex_digit(byte)) {
|
||||||
return AK::Error::from_string_literal("Hex string contains invalid digit");
|
u8 hex_digit = decode_hex_digit(byte);
|
||||||
|
if (have_read_high_nibble) {
|
||||||
auto const c2 = decode_hex_digit(static_cast<char>(bytes[i * 2 + 1]));
|
u8 full_byte = (high_nibble << 4) | hex_digit;
|
||||||
if (c2 >= 16)
|
TRY(output.try_append(full_byte));
|
||||||
return AK::Error::from_string_literal("Hex string contains invalid digit");
|
have_read_high_nibble = false;
|
||||||
|
} else {
|
||||||
output[i] = (c1 << 4) + c2;
|
high_nibble = hex_digit;
|
||||||
|
have_read_high_nibble = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process last byte with a padded zero
|
// If the filter encounters the EOD marker after reading an odd number
|
||||||
output[output.size() - 1] = decode_hex_digit(static_cast<char>(bytes[bytes.size() - 1])) * 16;
|
// of hexadecimal digits, it behaves as if a 0 followed the last digit.
|
||||||
|
if (have_read_high_nibble)
|
||||||
|
TRY(output.try_append(high_nibble << 4));
|
||||||
|
|
||||||
return { move(output) };
|
return output;
|
||||||
};
|
};
|
||||||
|
|
||||||
PDFErrorOr<ByteBuffer> Filter::decode_ascii85(ReadonlyBytes bytes)
|
PDFErrorOr<ByteBuffer> Filter::decode_ascii85(ReadonlyBytes bytes)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue