Commit 3a3ce6ad authored by Dominik Röttsches's avatar Dominik Röttsches Committed by Chromium LUCI CQ

Roll OTS to latest upstream

After moving OTS to a DEPS-based checkout in [1] but keeping it at the
same commit position, now roll OTS forward to upstream tip-of-tree.

Update baselines to reflect that OTS changed the wording of some
error messages.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/2589853

Bug: 1158389
Binary-Size: OTS has not been rolled in a long time and is a required component to protect against malicious web fonts and to avoid bugs in the system font stack.
Change-Id: I5999049091f6c4472a0613d5fb5b284929e7702d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2635654
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844671}
parent fe153c04
...@@ -266,7 +266,7 @@ vars = { ...@@ -266,7 +266,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling OTS # the commit queue can handle CLs rolling OTS
# and whatever else without interference from each other. # and whatever else without interference from each other.
'ots_revision': 'e5d1029ad9a16e1209b2fe7a2f8901aa42a9698c', 'ots_revision': 'ee537ac096667eed6559124164c3e8482646fd77',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult # the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
CONSOLE WARNING: Failed to decode downloaded font: data:font/ttf;base64,VGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250Lgo= CONSOLE WARNING: Failed to decode downloaded font: data:font/ttf;base64,VGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250LiAgVGhpcyBpcyBub3QgYSBmb250Lgo=
CONSOLE WARNING: OTS parsing error: invalid version tag CONSOLE WARNING: OTS parsing error: invalid sfntVersion: 1416128883
Test for bug 85089: [Qt] ASSERT in FontCustomPlatformDataQt.cpp with invalid font in data URI Test for bug 85089: [Qt] ASSERT in FontCustomPlatformDataQt.cpp with invalid font in data URI
This tests for an ASSERT when using @font-face with invalid font data This tests for an ASSERT when using @font-face with invalid font data
CONSOLE WARNING: Failed to decode downloaded font: invalidfont.png CONSOLE WARNING: Failed to decode downloaded font: invalidfont.png
CONSOLE WARNING: OTS parsing error: invalid version tag CONSOLE WARNING: OTS parsing error: invalid sfntVersion: -1991225785
CONSOLE WARNING: Failed to decode downloaded font: data:application/x-truetype-font, CONSOLE WARNING: Failed to decode downloaded font: data:application/x-truetype-font,
CONSOLE WARNING: Failed to decode downloaded font: data:application/x-truetype-font, CONSOLE WARNING: Failed to decode downloaded font: data:application/x-truetype-font,
Test download error cases. Test download error cases.
......
CONSOLE WARNING: Failed to decode downloaded font: custom-font-data-crash.html CONSOLE WARNING: Failed to decode downloaded font: custom-font-data-crash.html
CONSOLE WARNING: OTS parsing error: invalid version tag CONSOLE WARNING: OTS parsing error: invalid sfntVersion: 1008813135
PASS PASS
CONSOLE WARNING: Failed to decode downloaded font: custom-font-data-crash2.html CONSOLE WARNING: Failed to decode downloaded font: custom-font-data-crash2.html
CONSOLE WARNING: OTS parsing error: invalid version tag CONSOLE WARNING: OTS parsing error: invalid sfntVersion: 1008813135
PASS PASS
...@@ -12,16 +12,22 @@ static_library("ots") { ...@@ -12,16 +12,22 @@ static_library("ots") {
sources = [ sources = [
"src/include/opentype-sanitiser.h", "src/include/opentype-sanitiser.h",
"src/include/ots-memory-stream.h", "src/include/ots-memory-stream.h",
"src/src/avar.cc",
"src/src/avar.h",
"src/src/cff.cc", "src/src/cff.cc",
"src/src/cff.h", "src/src/cff.h",
"src/src/cff_type2_charstring.cc", "src/src/cff_charstring.cc",
"src/src/cff_type2_charstring.h", "src/src/cff_charstring.h",
"src/src/cmap.cc", "src/src/cmap.cc",
"src/src/cmap.h", "src/src/cmap.h",
"src/src/cvar.cc",
"src/src/cvar.h",
"src/src/cvt.cc", "src/src/cvt.cc",
"src/src/cvt.h", "src/src/cvt.h",
"src/src/fpgm.cc", "src/src/fpgm.cc",
"src/src/fpgm.h", "src/src/fpgm.h",
"src/src/fvar.cc",
"src/src/fvar.h",
"src/src/gasp.cc", "src/src/gasp.cc",
"src/src/gasp.h", "src/src/gasp.h",
"src/src/gdef.cc", "src/src/gdef.cc",
...@@ -32,14 +38,17 @@ static_library("ots") { ...@@ -32,14 +38,17 @@ static_library("ots") {
"src/src/gpos.h", "src/src/gpos.h",
"src/src/gsub.cc", "src/src/gsub.cc",
"src/src/gsub.h", "src/src/gsub.h",
"src/src/gvar.cc",
"src/src/gvar.h",
"src/src/hdmx.cc", "src/src/hdmx.cc",
"src/src/hdmx.h", "src/src/hdmx.h",
"src/src/head.cc", "src/src/head.cc",
"src/src/head.h", "src/src/head.h",
"src/src/hhea.cc", "src/src/hhea.cc",
"src/src/hhea.h", "src/src/hhea.h",
"src/src/hmtx.cc",
"src/src/hmtx.h", "src/src/hmtx.h",
"src/src/hvar.cc",
"src/src/hvar.h",
"src/src/kern.cc", "src/src/kern.cc",
"src/src/kern.h", "src/src/kern.h",
"src/src/layout.cc", "src/src/layout.cc",
...@@ -54,6 +63,8 @@ static_library("ots") { ...@@ -54,6 +63,8 @@ static_library("ots") {
"src/src/maxp.h", "src/src/maxp.h",
"src/src/metrics.cc", "src/src/metrics.cc",
"src/src/metrics.h", "src/src/metrics.h",
"src/src/mvar.cc",
"src/src/mvar.h",
"src/src/name.cc", "src/src/name.cc",
"src/src/name.h", "src/src/name.h",
"src/src/os2.cc", "src/src/os2.cc",
...@@ -64,14 +75,19 @@ static_library("ots") { ...@@ -64,14 +75,19 @@ static_library("ots") {
"src/src/post.h", "src/src/post.h",
"src/src/prep.cc", "src/src/prep.cc",
"src/src/prep.h", "src/src/prep.h",
"src/src/stat.cc",
"src/src/stat.h",
"src/src/variations.cc",
"src/src/variations.h",
"src/src/vdmx.cc", "src/src/vdmx.cc",
"src/src/vdmx.h", "src/src/vdmx.h",
"src/src/vhea.cc", "src/src/vhea.cc",
"src/src/vhea.h", "src/src/vhea.h",
"src/src/vmtx.cc",
"src/src/vmtx.h", "src/src/vmtx.h",
"src/src/vorg.cc", "src/src/vorg.cc",
"src/src/vorg.h", "src/src/vorg.h",
"src/src/vvar.cc",
"src/src/vvar.h",
] ]
public_configs = [ ":ots_config" ] public_configs = [ ":ots_config" ]
......
Name: OTS (OpenType Sanitizer) Name: OTS (OpenType Sanitizer)
URL: https://github.com/khaledhosny/ots.git URL: https://github.com/khaledhosny/ots.git
Version: e5d1029ad9a16e1209b2fe7a2f8901aa42a9698c Version: ee537ac096667eed6559124164c3e8482646fd77
Security Critical: yes Security Critical: yes
License: BSD License: BSD
Local Modifications: Local Modifications:
- BUILD.gn: Added. - BUILD.gn: Added.
- fuzz/: Added. - fuzz/: Added.
- e5d1029ad9a16e1209b2fe7a2f8901aa42a9698c points to a commit
chromiumOTSbeforeDEPS which has additional changes backported to the ots
version at which we switched to a DEPS based checkout, these changes are:
- e5d1029 [glyf] Guard access to maxp version 1 fields
- 177b26f ComponentPointCount initialisation review comments
- b8138ac Factor out glyph buffer retrieval
- 9b14724 Sanitise values for maxPoints, maxComponentPoints maxComponentDepth
- aeb6ce9 Don't bail if CFF2 glyph table is present
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment