download.lst | 4 -
external/freetype/ubsan.patch | 114 ------------------------------------------
2 files changed, 2 insertions(+), 116 deletions(-)
New commits:
commit 1456b498ddb421ce84bb83232d5a40886418f73b
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Nov 16 13:37:33 2022 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Nov 22 10:45:30 2022 +0100
Update freetype to 2.12.0
- fixes CVE-2022-27404
- dropped the no longer applying parts of ubsan.patch
Change-Id: Ia8a496d53b62f68a27dbd9be08c89273b6bd01cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142768
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
(cherry picked from commit 7229a380d3d607dc896e1d48b1a13f7b301aef80)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142927
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index e29087c0b4b7..36259689d9e8 100644
--- a/download.lst
+++ b/download.lst
@@ -92,8 +92,8 @@ export FONT_SCHEHERAZADE_SHA256SUM :=
251c8817ceb87d9b661ce1d5b49e732a0116add10a
export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
-export FREETYPE_SHA256SUM :=
3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
-export FREETYPE_TARBALL := freetype-2.11.1.tar.xz
+export FREETYPE_SHA256SUM :=
ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033
+export FREETYPE_TARBALL := freetype-2.12.0.tar.xz
export GLM_SHA256SUM :=
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
export GLM_TARBALL := glm-0.9.9.8.zip
export GPGME_SHA256SUM :=
6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
diff --git a/external/freetype/ubsan.patch b/external/freetype/ubsan.patch
index 236ef023bf1b..c8173eeff531 100644
--- a/external/freetype/ubsan.patch
+++ b/external/freetype/ubsan.patch
@@ -1,117 +1,3 @@
---- src/autofit/afcjk.c
-+++ src/autofit/afcjk.c
-@@ -843,7 +843,7 @@
- {
- AF_AxisHints axis = &hints->axis[dim];
- AF_Segment segments = axis->segments;
-- AF_Segment segment_limit = segments + axis->num_segments;
-+ AF_Segment segment_limit = axis->num_segments == 0 ? segments :
segments + axis->num_segments;
- AF_Direction major_dir = axis->major_dir;
- AF_Segment seg1, seg2;
- FT_Pos len_threshold;
-@@ -1005,7 +1005,7 @@
- AF_CJKAxis laxis = &((AF_CJKMetrics)hints->metrics)->axis[dim];
-
- AF_Segment segments = axis->segments;
-- AF_Segment segment_limit = segments + axis->num_segments;
-+ AF_Segment segment_limit = axis->num_segments == 0 ? segments :
segments + axis->num_segments;
- AF_Segment seg;
-
- FT_Fixed scale;
-@@ -1153,7 +1153,7 @@
- */
- {
- AF_Edge edges = axis->edges;
-- AF_Edge edge_limit = edges + axis->num_edges;
-+ AF_Edge edge_limit = axis->num_edges == 0 ? edges : edges +
axis->num_edges;
- AF_Edge edge;
-
-
-@@ -1291,7 +1291,7 @@
- {
- AF_AxisHints axis = &hints->axis[dim];
- AF_Edge edge = axis->edges;
-- AF_Edge edge_limit = edge + axis->num_edges;
-+ AF_Edge edge_limit = axis->num_edges == 0 ? edge : edge +
axis->num_edges;
- AF_CJKAxis cjk = &metrics->axis[dim];
- FT_Fixed scale = cjk->scale;
- FT_Pos best_dist0; /* initial threshold */
-@@ -1798,7 +1798,7 @@
- {
- AF_AxisHints axis = &hints->axis[dim];
- AF_Edge edges = axis->edges;
-- AF_Edge edge_limit = edges + axis->num_edges;
-+ AF_Edge edge_limit = axis->num_edges == 0 ? edges : edges +
axis->num_edges;
- FT_PtrDist n_edges;
- AF_Edge edge;
- AF_Edge anchor = NULL;
-@@ -2177,7 +2177,7 @@
- {
- AF_AxisHints axis = & hints->axis[dim];
- AF_Edge edges = axis->edges;
-- AF_Edge edge_limit = edges + axis->num_edges;
-+ AF_Edge edge_limit = axis->num_edges == 0 ? edges : edges +
axis->num_edges;
- AF_Edge edge;
- FT_Bool snapping;
-
---- src/autofit/afhints.c
-+++ src/autofit/afhints.c
-@@ -1316,7 +1316,7 @@
- {
- AF_AxisHints axis = & hints->axis[dim];
- AF_Segment segments = axis->segments;
-- AF_Segment segment_limit = segments + axis->num_segments;
-+ AF_Segment segment_limit = axis->num_segments == 0 ? segments :
segments + axis->num_segments;
- AF_Segment seg;
-
-
-@@ -1393,7 +1393,7 @@
- AF_Point point_limit = points + hints->num_points;
- AF_AxisHints axis = &hints->axis[dim];
- AF_Edge edges = axis->edges;
-- AF_Edge edge_limit = edges + axis->num_edges;
-+ AF_Edge edge_limit = axis->num_edges == 0 ? edges : edges +
axis->num_edges;
- FT_UInt touch_flag;
-
-
---- src/autofit/aflatin.c
-+++ src/autofit/aflatin.c
-@@ -1989,7 +1989,7 @@
- {
- AF_AxisHints axis = &hints->axis[dim];
- AF_Segment segments = axis->segments;
-- AF_Segment segment_limit = segments + axis->num_segments;
-+ AF_Segment segment_limit = axis->num_segments == 0 ? segments :
segments + axis->num_segments;
- FT_Pos len_threshold, len_score, dist_score, max_width;
- AF_Segment seg1, seg2;
-
-@@ -2134,7 +2134,7 @@
- FT_Bool top_to_bottom_hinting = 0;
-
- AF_Segment segments = axis->segments;
-- AF_Segment segment_limit = segments + axis->num_segments;
-+ AF_Segment segment_limit = axis->num_segments == 0 ? segments :
segments + axis->num_segments;
- AF_Segment seg;
-
- #if 0
-@@ -2500,7 +2500,7 @@
- {
- AF_AxisHints axis = &hints->axis[AF_DIMENSION_VERT];
- AF_Edge edge = axis->edges;
-- AF_Edge edge_limit = edge + axis->num_edges;
-+ AF_Edge edge_limit = axis->num_edges == 0 ? edge : edge +
axis->num_edges;
- AF_LatinAxis latin = &metrics->axis[AF_DIMENSION_VERT];
- FT_Fixed scale = latin->scale;
-
-@@ -2993,7 +2993,7 @@
- {
- AF_AxisHints axis = &hints->axis[dim];
- AF_Edge edges = axis->edges;
-- AF_Edge edge_limit = edges + axis->num_edges;
-+ AF_Edge edge_limit = axis->num_edges == 0 ? edges : edges +
axis->num_edges;
- FT_PtrDist n_edges;
- AF_Edge edge;
- AF_Edge anchor = NULL;
--- src/truetype/ttgxvar.c
+++ src/truetype/ttgxvar.c
@@ -964,7 +964,7 @@
