3 files changed, 7 insertions, 7 deletions

diff --git a/gs/jbig2dec/jbig2_arith.c b/gs/jbig2dec/jbig2_arith.c
index ee0e3a373..5e6cf4c9c 100644
--- a/gs/jbig2dec/jbig2_arith.c
+++ b/gs/jbig2dec/jbig2_arith.c
@@ -379,10 +379,10 @@ jbig2_arith_decode (Jbig2ArithState *as, Jbig2ArithCx *pcx)
     }
 }
 
-int
-jbig2_arith_get_offset(Jbig2ArithState *as)
+bool
+jbig2_arith_has_reached_marker(Jbig2ArithState *as)
 {
-  return as->offset;
+  return as->next_word_bytes == 2 && (as->next_word >> 16) > 0xFF8F;
 }
 
 #ifdef TEST
diff --git a/gs/jbig2dec/jbig2_arith.h b/gs/jbig2dec/jbig2_arith.h
index 46c190311..4f7c39d09 100644
--- a/gs/jbig2dec/jbig2_arith.h
+++ b/gs/jbig2dec/jbig2_arith.h
@@ -33,6 +33,6 @@ jbig2_arith_new (Jbig2Ctx *ctx, Jbig2WordStream *ws);
 bool
 jbig2_arith_decode (Jbig2ArithState *as, Jbig2ArithCx *pcx);
 
-/* return the state's offset (for sanity checks) */
-int
-jbig2_arith_get_offset(Jbig2ArithState *as);
+/* returns true if the end of the data stream has been reached (for sanity checks) */
+bool
+jbig2_arith_has_reached_marker(Jbig2ArithState *as);
diff --git a/gs/jbig2dec/jbig2_symbol_dict.c b/gs/jbig2dec/jbig2_symbol_dict.c
index e12e89bfb..07e04d8ee 100644
--- a/gs/jbig2dec/jbig2_symbol_dict.c
+++ b/gs/jbig2dec/jbig2_symbol_dict.c
@@ -361,7 +361,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
           "error or OOB decoding height class delta (%d)\n", code);
       }
 
-      if (!params->SDHUFF && jbig2_arith_get_offset(as) >= size) {
+      if (!params->SDHUFF && jbig2_arith_has_reached_marker(as)) {
           code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
               "prevent DOS while decoding height classes");
           goto cleanup2;