--- old/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc	2017-11-30 10:47:08.609458199 -0800
+++ new/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc	2017-11-30 10:47:08.425458204 -0800
@@ -210,7 +210,7 @@
   pos.x_offset = pos.y_offset = 0;
 
 
-  /* We dont position LEFT and RIGHT marks. */
+  /* We don't position LEFT and RIGHT marks. */
 
   /* X positioning */
   switch (combining_class)
@@ -307,6 +307,9 @@
                       unsigned int end)
 {
   hb_direction_t horiz_dir = HB_DIRECTION_INVALID;
+
+  buffer->unsafe_to_break (base, end);
+
   hb_glyph_extents_t base_extents;
   if (!font->get_glyph_extents (buffer->info[base].codepoint,
                                 &base_extents))