Bug 1914333 - Backport -fstrict-flex-arrays=2 support for harfbuzz r=gfx-reviewers,nical

Differential Revision: https://phabricator.services.mozilla.com/D219850

gfx/harfbuzz/moz.yaml

@@ -60,6 +60,10 @@ vendoring:
     - "src/test*"
     - src/hb-ucdn
 
+  patches:
+    # See discussion in https://github.com/harfbuzz/harfbuzz/pull/4836
+    - 0001-Fix-warnings-with-fstrict-flex-arrays-2.patch
+
 updatebot:
   maintainer-phab: jfkthame
   maintainer-bz: jfkthame@gmail.com

gfx/harfbuzz/src/hb-open-type.hh

@@ -209,7 +209,7 @@ struct HBUINT32VAR
   }
 
   protected:
-  unsigned char v[1];
+  unsigned char v[5];
 
   public:
   DEFINE_SIZE_MIN (1);

gfx/harfbuzz/src/hb.hh

@@ -84,6 +84,7 @@
 #pragma GCC diagnostic error   "-Wredundant-decls"
 #pragma GCC diagnostic error   "-Wreorder"
 #pragma GCC diagnostic error   "-Wsign-compare"
+#pragma GCC diagnostic error   "-Wstrict-flex-arrays"
 #pragma GCC diagnostic error   "-Wstrict-prototypes"
 #pragma GCC diagnostic error   "-Wstring-conversion"
 #pragma GCC diagnostic error   "-Wswitch-enum"