Commit ba06adafcdd35a34af6d9be63800c2f55dd03a75
2019-09-29T13:29:21
[woff2] Fix compiler warnings. Problem reported by Alexei. * src/sfnt/sfwoff2.c (reconstruct_glyf): Initialize `x_min'. (reconstruct_font): Initialize `num_hmetrics'. (woff2_open_font): Initialize `info'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/ChangeLog b/ChangeLog
index 1904cda..f0ffdd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2019-09-29 Werner Lemberg <wl@gnu.org>
+
+ [woff2] Fix compiler warnings.
+
+ Problem reported by Alexei.
+
+ * src/sfnt/sfwoff2.c (reconstruct_glyf): Initialize `x_min'.
+ (reconstruct_font): Initialize `num_hmetrics'.
+ (woff2_open_font): Initialize `info'.
+
2019-09-28 Werner Lemberg <wl@gnu.org>
* src/sfnt/sfwoff2.c (woff2_open_font): Fix sanity check.
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index daa9a7c..ca602d1 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -927,7 +927,6 @@
if ( FT_NEW_ARRAY( glyph_buf, glyph_buf_size ) )
goto Fail;
- info->x_mins = NULL;
if ( FT_NEW_ARRAY( info->x_mins, num_glyphs ) )
goto Fail;
@@ -938,7 +937,7 @@
FT_Bool have_bbox = FALSE;
FT_Byte bbox_bitmap;
FT_ULong bbox_offset;
- FT_UShort x_min;
+ FT_UShort x_min = 0;
/* Set `have_bbox'. */
@@ -1493,7 +1492,7 @@
FT_ULong checksum = 0;
FT_ULong loca_checksum = 0;
FT_Int nn = 0;
- FT_UShort num_hmetrics;
+ FT_UShort num_hmetrics = 0;
FT_ULong font_checksum = info->header_checksum;
FT_Bool is_glyf_xform = FALSE;
@@ -1727,7 +1726,7 @@
FT_Int face_index;
WOFF2_HeaderRec woff2;
- WOFF2_InfoRec info;
+ WOFF2_InfoRec info = { 0, 0, 0, NULL };
WOFF2_Table tables = NULL;
WOFF2_Table* indices = NULL;
WOFF2_Table* temp_indices = NULL;