Skip to content
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.

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

[CFF2] Lift uint16 VariationStore.length limitation #291

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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: 10 additions & 4 deletions src/cff.cc
Original file line number Diff line number Diff line change
Expand Up @@ -588,19 +588,25 @@ bool ParsePrivateDictData(
}

bool ParseVariationStore(ots::OpenTypeCFF& out_cff, ots::Buffer& table) {
uint16_t length;
uint16_t encoded_length;

if (!table.ReadU16(&length)) {
if (!table.ReadU16(&encoded_length)) {
return OTS_FAILURE();
}

unsigned length = encoded_length;

// Empty VariationStore is allowed.
if (!length) {
return true;
}

if (length > table.remaining()) {
return OTS_FAILURE();
if (length != 65535) {
if (length > table.remaining()) {
return OTS_FAILURE();
}
} else {
length = table.remaining();
}

if (!ParseItemVariationStore(out_cff.GetFont(),
Expand Down