[cff] Fix fetch_op() bounds-checking

2 years ago · 6905d36d73
parent b51ab1a9e5
commit 6905d36d73
1 changed files with 2 additions and 2 deletions
--- a/src/hb-cff-interp-common.hh
+++ b/src/hb-cff-interp-common.hh
@ -564,13 +564,13 @@ struct interp_env_t
    if (unlikely (!str_ref.avail ()))
      return OpCode_Invalid;
    op = (op_code_t)(unsigned char)str_ref[0];
+    str_ref.inc ();
    if (op == OpCode_escape) {
      if (unlikely (!str_ref.avail ()))
 	return OpCode_Invalid;
-      op = Make_OpCode_ESC(str_ref[1]);
+      op = Make_OpCode_ESC(str_ref[0]);
      str_ref.inc ();
    }
-    str_ref.inc ();
    return op;
  }