Revert "Fix Context lookup application when moving back after a glyph delete"
This reverts commit b9b005f3a44ccf78a45b212b126287b69b9f4b40.
This introduced invalid access cases. Revert until I fix correctly.
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 005ed21..f9fcec5 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -1021,13 +1021,14 @@
*/
end += delta;
- if (end < int (match_positions[idx]))
+ if (end <= int (match_positions[idx]))
{
/* End might end up being smaller than match_positions[idx] if the recursed
- * lookup ended up removing too many items.
+ * lookup ended up removing many items, more than we have had matched.
* Just never rewind end back and get out of here.
* https://bugs.chromium.org/p/chromium/issues/detail?id=659496 */
end = match_positions[idx];
+ /* There can't be any further changes. */
break;
}
@@ -1040,7 +1041,7 @@
}
else
{
- /* NOTE: delta is non-positive. */
+ /* NOTE: delta is negative. */
delta = MAX (delta, (int) next - (int) count);
next -= delta;
}
