summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/spc_pdfm.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-07-30 22:47:03 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-07-30 22:47:03 +0000
commite3231938212423e5e71506e58022397ff69cd34b (patch)
treee0fcbb8e953a4f58fe51564f83308635999604f5 /Build/source/texk/dvipdfm-x/spc_pdfm.c
parent1adec16a2d8fa1f86d601d124f85d7817bd4f233 (diff)
More fix to the previous fix for tt_cmap.c. Fix for a possible problem in cid.c. (S. Hirara)
git-svn-id: svn://tug.org/texlive/trunk@55999 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/spc_pdfm.c')
-rw-r--r--Build/source/texk/dvipdfm-x/spc_pdfm.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/Build/source/texk/dvipdfm-x/spc_pdfm.c b/Build/source/texk/dvipdfm-x/spc_pdfm.c
index f13aaef9d04..d6a72fe2c33 100644
--- a/Build/source/texk/dvipdfm-x/spc_pdfm.c
+++ b/Build/source/texk/dvipdfm-x/spc_pdfm.c
@@ -590,7 +590,7 @@ need_reencode (pdf_obj *kp, pdf_obj *vp, struct tounicode *cd)
}
static int
-modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
+modify_strings (pdf_obj *kp, pdf_obj *vp, void *dp)
{
int r = 0; /* continue */
struct tounicode *cd = dp;
@@ -598,7 +598,7 @@ modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
ASSERT( pdf_obj_typeof(kp) == PDF_NAME );
switch (pdf_obj_typeof(vp)) {
- case PDF_STRING:
+ case PDF_STRING:
if (cd && cd->cmap_id >= 0 && cd->taintkeys) {
CMap *cmap = CMap_cache_get(cd->cmap_id);
if (need_reencode(kp, vp, cd))
@@ -610,11 +610,24 @@ modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
if (r < 0) /* error occured... */
WARN("Input string conversion (to UTF16BE) failed for %s...", pdf_name_value(kp));
break;
- case PDF_DICT:
- r = pdf_foreach_dict(vp, modstrings, dp);
+ /* Array elements are also checked. */
+ case PDF_ARRAY:
+ {
+ int i;
+ for (i = 0; i < pdf_array_length(vp); i++) {
+ pdf_obj *obj;
+ obj = pdf_get_array(vp, i);
+ r = modify_strings(kp, obj, dp);
+ if (r < 0)
+ break;
+ }
+ }
break;
- case PDF_STREAM:
- r = pdf_foreach_dict(pdf_stream_dict(vp), modstrings, dp);
+ case PDF_DICT:
+ r = pdf_foreach_dict(vp, modify_strings, dp);
+ break;
+ case PDF_STREAM:
+ r = pdf_foreach_dict(pdf_stream_dict(vp), modify_strings, dp);
break;
}
@@ -647,7 +660,7 @@ parse_pdf_dict_with_tounicode (const char **pp, const char *endptr, struct touni
pdf_release_obj(dict);
dict = NULL;
} else {
- pdf_foreach_dict(dict, modstrings, cd);
+ pdf_foreach_dict(dict, modify_strings, cd);
}
}
}