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

*** 430,439 ****
--- 430,440 ----
       * return false such that the subsequent subtables have a chance at it. */
      if (unlikely (!found)) return_trace (false);
  
      hb_position_t mark_x, mark_y, base_x, base_y;
  
+     buffer->unsafe_to_break (glyph_pos, buffer->idx);
      mark_anchor.get_anchor (c, buffer->cur().codepoint, &mark_x, &mark_y);
      glyph_anchor.get_anchor (c, buffer->info[glyph_pos].codepoint, &base_x, &base_y);
  
      hb_glyph_position_t &o = buffer->cur_pos();
      o.x_offset = base_x - mark_x;
*** 641,650 ****
--- 642,652 ----
          max = mid - 1;
        else if (x > mid_x)
          min = mid + 1;
        else
        {
+         buffer->unsafe_to_break (buffer->idx, pos + 1);
          valueFormats[0].apply_value (c, this, &record->values[0], buffer->cur_pos());
          valueFormats[1].apply_value (c, this, &record->values[len1], buffer->pos[pos]);
          if (len2)
            pos++;
          buffer->idx = pos;
*** 788,797 ****
--- 790,800 ----
  
      unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint);
      unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint);
      if (unlikely (klass1 >= class1Count || klass2 >= class2Count)) return_trace (false);
  
+     buffer->unsafe_to_break (buffer->idx, skippy_iter.idx + 1);
      const Value *v = &values[record_len * (klass1 * class2Count + klass2)];
      valueFormat1.apply_value (c, this, v, buffer->cur_pos());
      valueFormat2.apply_value (c, this, v + len1, buffer->pos[skippy_iter.idx]);
  
      buffer->idx = skippy_iter.idx;
*** 927,936 ****
--- 930,940 ----
      if (!next_record.entryAnchor) return_trace (false);
  
      unsigned int i = buffer->idx;
      unsigned int j = skippy_iter.idx;
  
+     buffer->unsafe_to_break (i, j);
      hb_position_t entry_x, entry_y, exit_x, exit_y;
      (this+this_record.exitAnchor).get_anchor (c, buffer->info[i].codepoint, &exit_x, &exit_y);
      (this+next_record.entryAnchor).get_anchor (c, buffer->info[j].codepoint, &entry_x, &entry_y);
  
      hb_glyph_position_t *pos = buffer->pos;
*** 1081,1091 ****
      skippy_iter.reset (buffer->idx, 1);
      skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
      do {
        if (!skippy_iter.prev ()) return_trace (false);
        /* We only want to attach to the first of a MultipleSubst sequence.  Reject others. */
!       if (0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx])) break;
        skippy_iter.reject ();
      } while (1);
  
      /* Checking that matched glyph is actually a base glyph by GDEF is too strong; disabled */
      //if (!_hb_glyph_info_is_base_glyph (&buffer->info[skippy_iter.idx])) { return_trace (false); }
--- 1085,1097 ----
      skippy_iter.reset (buffer->idx, 1);
      skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
      do {
        if (!skippy_iter.prev ()) return_trace (false);
        /* We only want to attach to the first of a MultipleSubst sequence.  Reject others. */
!       if (!_hb_glyph_info_multiplied (&buffer->info[skippy_iter.idx]) ||
!           0 == _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]))
!         break;
        skippy_iter.reject ();
      } while (1);
  
      /* Checking that matched glyph is actually a base glyph by GDEF is too strong; disabled */
      //if (!_hb_glyph_info_is_base_glyph (&buffer->info[skippy_iter.idx])) { return_trace (false); }