summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJjgod Jiang <gzjjgod@gmail.com>2014-08-04 19:57:51 +0000
committerJjgod Jiang <gzjjgod@gmail.com>2014-08-04 19:57:51 +0000
commit40cde69d904eb89fe89fcd7bc4b7d458d113fe6d (patch)
tree27b8f52e5c47d73fe87a46e825b47583c100596b /Build
parentd0920a314908a614613e83ab01e3c31038022b8d (diff)
Fix crash and infinity look caused by r34831
git-svn-id: svn://tug.org/texlive/trunk@34836 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/tt_cmap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c
index db291fbaee4..05a0cb3bd30 100644
--- a/Build/source/texk/dvipdfm-x/tt_cmap.c
+++ b/Build/source/texk/dvipdfm-x/tt_cmap.c
@@ -1042,7 +1042,8 @@ create_ToUnicode_cmap12 (CMap *cmap,
char *used_glyphs,
cff_font *cffont)
{
- USHORT i, gid, ch, count = 0;
+ ULONG i, ch;
+ USHORT gid, count = 0;
for (i = 0; i < map->nGroups; i++) {
for (ch = map->groups[i].startCharCode;
@@ -1096,7 +1097,7 @@ create_ToUnicode_cmap (tt_cmap *ttcmap,
USHORT i, gid, count = 0;
char used_glyphs_copy[8192];
cff_font *cffont = prepare_CIDFont_from_sfnt(sfont);
- char is_cidfont = (cffont->flag & FONTTYPE_CIDFONT);
+ char is_cidfont = cffont && (cffont->flag & FONTTYPE_CIDFONT);
cmap = CMap_new();
CMap_set_name (cmap, cmap_name);