summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-05-12 22:18:04 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-05-12 22:18:04 +0000
commitbd459bc63bbacb77224c9d858759541096c095c8 (patch)
treef2a4dfc7e0f79173ddce7d234d126718f4b8c0d1 /Build
parentfc724ee279505d44d850bcbf5f01766814448230 (diff)
luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@41073 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/font/writeenc.w3
-rw-r--r--Build/source/texk/web2c/luatexdir/font/writefont.w2
2 files changed, 3 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/writeenc.w b/Build/source/texk/web2c/luatexdir/font/writeenc.w
index a6e4ebaaeac..1a7ed3891af 100644
--- a/Build/source/texk/web2c/luatexdir/font/writeenc.w
+++ b/Build/source/texk/web2c/luatexdir/font/writeenc.w
@@ -149,7 +149,8 @@ static void destroy_fe_entry(void *pa, void *pb)
if (p->glyph_names[i] != notdef)
xfree(p->glyph_names[i]);
xfree(p->glyph_names);
- avl_destroy(p->tx_tree,NULL);
+ if (p->tx_tree != NULL)
+ avl_destroy(p->tx_tree,NULL);
xfree(p);
}
diff --git a/Build/source/texk/web2c/luatexdir/font/writefont.w b/Build/source/texk/web2c/luatexdir/font/writefont.w
index 81a8b0f9b04..ab47d9626e7 100644
--- a/Build/source/texk/web2c/luatexdir/font/writefont.w
+++ b/Build/source/texk/web2c/luatexdir/font/writefont.w
@@ -681,7 +681,7 @@ static void create_fontdictionary(PDF pdf, internal_font_number f)
fo->tex_font = f;
if (is_reencoded(fo->fm)) { /* at least the map entry tells so */
fo->fe = get_fe_entry(fo->fm->encname); /* returns |NULL| if .enc file couldn't be opened */
- if (fo->fe != NULL && (is_type1(fo->fm) || is_opentype(fo->fm))) {
+ if (fo->fe != NULL && (is_type1(fo->fm) || is_opentype(fo->fm))) { /* not entered for truetype */
if (fo->fe->fe_objnum == 0)
fo->fe->fe_objnum = pdf_create_obj(pdf, obj_type_others, 0); /* then it will be written out */
/* mark encoding pairs used by TeX to optimize encoding vector */