summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Röttsches <drott@chromium.org>2019-08-27 15:08:15 +0300
committerWerner Lemberg <wl@gnu.org>2019-08-27 19:17:56 +0200
commitcbee985a2bc14750ff850192f9ee8c1efe2bd7c7 (patch)
tree9de246f7939f031cff3f28741e71097327431ab4
parent594156586b888805681a7085a780bd743fb180bd (diff)
downloadfreetype2-cbee985a2bc14750ff850192f9ee8c1efe2bd7c7.tar.gz
[woff2] Don't use `FT_UInt64' (#56815).
* src/sfnt/sfwoff2.c (woff2_open_font): Use `FT_UInt32' for `file_offset'. This fixes builds on platforms where `FT_LONG64' is not defined while still being sufficient to store a file offset.
-rw-r--r--ChangeLog8
-rw-r--r--src/sfnt/sfwoff2.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 04124849f..390402010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-08-27 Dominik Röttsches <drott@chromium.org>
+
+ [woff2] Don't use `FT_UInt64' (#56815).
+
+ * src/sfnt/sfwoff2.c (woff2_open_font): Use `FT_UInt32' for
+ `file_offset'. This fixes builds on platforms where `FT_LONG64' is
+ not defined while still being sufficient to store a file offset.
+
2019-08-27 Werner Lemberg <wl@gnu.org>
[truetype] Prevent crash in `TT_Set_Named_Instance' (#56813).
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index 6ee688737..a599ae505 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -1739,7 +1739,7 @@
FT_UInt glyf_index;
FT_UInt loca_index;
- FT_UInt64 file_offset;
+ FT_UInt32 file_offset;
FT_Byte* sfnt = NULL;
FT_Stream sfnt_stream = NULL;