From 91e1a0268705fed13c9d902755c55a08409c0ab6 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 23 Jun 2017 22:11:40 +0000 Subject: ttfdump.c: avoid segmentation fault. (by H. Yamashita) git-svn-id: svn://tug.org/texlive/trunk@44678 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ttfdump/ChangeLog | 7 ++++++- Build/source/texk/ttfdump/src/ttfdump.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog index 5d84a8c5b7e..c86848cfe1b 100644 --- a/Build/source/texk/ttfdump/ChangeLog +++ b/Build/source/texk/ttfdump/ChangeLog @@ -1,4 +1,9 @@ -2016-07-15 Adrian Johnson +2017-06-23 Hironobu Yamashita + + * src/ttfdump.c: avoid segmentation fault when the requested + ttc font is not found. + +2016-07-15 Adrian Johnson * libttf/cmap.c, * libttf/name.c, diff --git a/Build/source/texk/ttfdump/src/ttfdump.c b/Build/source/texk/ttfdump/src/ttfdump.c index e374db745cb..e0d71efebad 100644 --- a/Build/source/texk/ttfdump/src/ttfdump.c +++ b/Build/source/texk/ttfdump/src/ttfdump.c @@ -163,6 +163,10 @@ main(int argc, char *argv[]) if (strstr (ttfname, "ttc") != NULL) { ttc = ttfLoadTTCHeader(ttfname); + + if (ttc == NULL) + exit(EXIT_FAILURE); + if (collection < ttc->DirCount) font = ttc->font + collection; else -- cgit v1.2.3