2 files changed, 12 insertions, 1 deletions

diff --git a/base/sa85d.h b/base/sa85d.h
index 6e7462243..8685af7f4 100644
--- a/base/sa85d.h
+++ b/base/sa85d.h
@@ -41,7 +41,14 @@ typedef struct stream_A85D_state_s {
   (ss)->min_left = 1; \
   (ss)->word = 0; \
   (ss)->odd = 0; \
-  /* pdf_rules should not be initialized here */ \
+  /* pdf_rules should not be initialized here. This flag is initialised in\
+   * zA85D to either true or false, and this inline function is called *after*\
+   * that in s_A85D_init to do the remaining initialisation. However, this\
+   * inline function is also called from gs_scan_token to handle inline\
+   * ASCII85 strings. These are not to be interpreted using PDF rules\
+   * and so we must not set the flag here, but in the relevant calling\
+   * functions.\
+   */ \
   (ss)->require_eod=false; \
   END
 extern const stream_template s_A85D_template;
diff --git a/psi/iscan.c b/psi/iscan.c
index e5956e1bc..9b7151aa3 100644
--- a/psi/iscan.c
+++ b/psi/iscan.c
@@ -581,6 +581,10 @@ gs_scan_token(i_ctx_t *i_ctx_p, ref * pref, scanner_state * pstate)
                         s_A85D_init_inline(&sstate.s_ss.a85d);
                         sstate.s_ss.st.templat = &s_A85D_template;
                         sstate.s_ss.a85d.require_eod = true;
+                        /* If this is an inline ASCII string, interpret it normally, throw an error
+                         * if it fails rather than ignoring it as PDF (Acrobat) does.
+                         */
+                        sstate.s_ss.a85d.pdf_rules = false;
                         goto str;
                 }
                 sputback_inline(s, sptr, endptr);