Backport dbdbbd473061d7e8077ed07ccc6b03065a8c2ffc

Author: duke

make/modules/java.desktop/lib/ClientLibraries.gmk

@@ -327,7 +327,7 @@ else
 
   HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers \
       strict-aliasing unused-result array-bounds parentheses \
-       unused-variable
+       unused-variable dangling-pointer
   # noexcept-type required for GCC 7 builds. Not required for GCC 8+.
   # expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
   # maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+.

src/java.desktop/share/legal/harfbuzz.md

@@ -1,4 +1,4 @@
-## Harfbuzz v8.2.2
+## Harfbuzz v10.4.0
 
 ### Harfbuzz License
 
@@ -8,14 +8,14 @@ HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
 For parts of HarfBuzz that are licensed under different licenses see individual
 files names COPYING in subdirectories where applicable.
 
-Copyright © 2010-2023  Google, Inc.
+Copyright © 2010-2024  Google, Inc.
 Copyright © 2018-2020  Ebrahim Byagowi
 Copyright © 2004-2013  Red Hat, Inc.
 Copyright © 2019  Facebook, Inc.
 Copyright (C) 2012 Zilong Tan ([email protected])
 Copyright © 2007  Chris Wilson
 Copyright © 2018-2019 Adobe Inc.
-Copyright © 2006-2023 Behdad Esfahbod
+Copyright © 2006-2025 Behdad Esfahbod
 Copyright © 1998-2004  David Turner and Werner Lemberg
 Copyright © 2009  Keith Stribley
 Copyright © 2018  Khaled Hosny
@@ -54,7 +54,7 @@ exception is licensed with a slightly different MIT variant:
 The contents of this directory are licensed under the following terms:
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 libharfbuzz/hb-ucd.cc
 
 Copyright (C) 2012 Grigori Goronzy <[email protected]>
@@ -72,13 +72,14 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 libharfbuzz/hb-unicode-emoji-table.hh
 
-© 2023 Unicode®, Inc.
+© 2024 Unicode®, Inc.
+
 Unicode and the Unicode Logo are registered trademarks of Unicode, Inc.
 in the U.S. and other countries.
-For terms of use, see https://www.unicode.org/terms_of_use.html
+For terms of use and license, see https://www.unicode.org/terms_of_use.html
 
 </pre>
 

src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh

@@ -204,6 +204,7 @@ struct IndexSubtable
   {
     TRACE_SANITIZE (this);
     if (!u.header.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.header.indexFormat)
     {
     case 1: return_trace (u.format1.sanitize (c, glyph_count));
@@ -378,6 +379,7 @@ struct IndexSubtableRecord
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   firstGlyphIndex <= lastGlyphIndex &&
                   offsetToSubtable.sanitize (c, base, lastGlyphIndex - firstGlyphIndex + 1));
   }
@@ -635,6 +637,7 @@ struct BitmapSizeTable
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) &&
                   horizontal.sanitize (c) &&
                   vertical.sanitize (c));
@@ -738,7 +741,9 @@ struct CBLC
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (version.major == 2 || version.major == 3) &&
+                  hb_barrier () &&
                   sizeTables.sanitize (c, this));
   }
 
@@ -936,10 +941,12 @@ struct CBDT
       }
     }
 
-    bool has_data () const { return cbdt.get_length (); }
+    bool has_data () const { return cbdt->version.major; }
 
     bool paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data) const
     {
+      if (!has_data ()) return false;
+
       hb_glyph_extents_t extents;
       hb_glyph_extents_t pixel_extents;
       hb_blob_t *blob = reference_png (font, glyph);
@@ -975,6 +982,7 @@ struct CBDT
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (version.major == 2 || version.major == 3));
   }