src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh

*** 378,390 ****
                    defaultUVS.sanitize (c, base) &&
                    nonDefaultUVS.sanitize (c, base));
    }
  
    UINT24        varSelector;    /* Variation selector. */
!   OffsetTo<DefaultUVS, ULONG>
                  defaultUVS;     /* Offset to Default UVS Table. May be 0. */
!   OffsetTo<NonDefaultUVS, ULONG>
                  nonDefaultUVS;  /* Offset to Non-Default UVS Table. May be 0. */
    public:
    DEFINE_SIZE_STATIC (11);
  };
  
--- 378,390 ----
                    defaultUVS.sanitize (c, base) &&
                    nonDefaultUVS.sanitize (c, base));
    }
  
    UINT24        varSelector;    /* Variation selector. */
!   LOffsetTo<DefaultUVS>
                  defaultUVS;     /* Offset to Default UVS Table. May be 0. */
!   LOffsetTo<NonDefaultUVS>
                  nonDefaultUVS;  /* Offset to Non-Default UVS Table. May be 0. */
    public:
    DEFINE_SIZE_STATIC (11);
  };
  
*** 484,494 ****
                    subtable.sanitize (c, base));
    }
  
    USHORT        platformID;     /* Platform ID. */
    USHORT        encodingID;     /* Platform-specific encoding ID. */
!   OffsetTo<CmapSubtable, ULONG>
                  subtable;       /* Byte offset from beginning of table to the subtable for this encoding. */
    public:
    DEFINE_SIZE_STATIC (8);
  };
  
--- 484,494 ----
                    subtable.sanitize (c, base));
    }
  
    USHORT        platformID;     /* Platform ID. */
    USHORT        encodingID;     /* Platform-specific encoding ID. */
!   LOffsetTo<CmapSubtable>
                  subtable;       /* Byte offset from beginning of table to the subtable for this encoding. */
    public:
    DEFINE_SIZE_STATIC (8);
  };
  
*** 506,516 ****
      /* Note: We can use bsearch, but since it has no performance
       * implications, we use lsearch and as such accept fonts with
       * unsorted subtable list. */
      int result = encodingRecord./*bsearch*/lsearch (key);
      if (result == -1 || !encodingRecord[result].subtable)
!       return NULL;
  
      return &(this+encodingRecord[result].subtable);
    }
  
    inline bool sanitize (hb_sanitize_context_t *c) const
--- 506,516 ----
      /* Note: We can use bsearch, but since it has no performance
       * implications, we use lsearch and as such accept fonts with
       * unsorted subtable list. */
      int result = encodingRecord./*bsearch*/lsearch (key);
      if (result == -1 || !encodingRecord[result].subtable)
!       return nullptr;
  
      return &(this+encodingRecord[result].subtable);
    }
  
    inline bool sanitize (hb_sanitize_context_t *c) const