diff options
author | Jjgod Jiang <gzjjgod@gmail.com> | 2014-07-28 07:06:44 +0000 |
---|---|---|
committer | Jjgod Jiang <gzjjgod@gmail.com> | 2014-07-28 07:06:44 +0000 |
commit | d0944d0bb67a6430727288f61c11613da3a6afa4 (patch) | |
tree | e676b607c9972409c580977ab4c52ee845cd41a6 /Build/source | |
parent | 4e91633d603855826c897fdd1d7d3e47860078bf (diff) |
Correct release of retained cff_charsets
The cff_charsets we retained is owned and cached by cid_opt struct
thus should be released in release_opt() instead of pdf_close_device().
git-svn-id: svn://tug.org/texlive/trunk@34749 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/cid.c | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/pdfdev.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 7fdca03d6f7..34af2f8148a 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,7 @@ +2014-07-28 Jiang Jiang <gzjjgod@gmail.com> + + * cid.c, pdfdev.c: Correct release of retained cff_charsets. + 2014-07-27 Jiang Jiang <gzjjgod@gmail.com> * cff.c, cff.h, cid.c, cid_p.h, cidtype0.c, fontmap.c, fontmap.h, diff --git a/Build/source/texk/dvipdfm-x/cid.c b/Build/source/texk/dvipdfm-x/cid.c index b82a3b713ae..90e19bf238b 100644 --- a/Build/source/texk/dvipdfm-x/cid.c +++ b/Build/source/texk/dvipdfm-x/cid.c @@ -42,6 +42,8 @@ #include "cid_p.h" #include "cid.h" +#include "cff.h" + #define CIDFONT_DEBUG 3 #define CIDFONT_DEBUG_STR "CIDFont" @@ -706,6 +708,8 @@ release_opt (cid_opt *opt) if (opt->csi->ordering) RELEASE(opt->csi->ordering); RELEASE(opt->csi); + if (opt->cff_charsets) + cff_release_charsets((cff_charsets *) opt->cff_charsets); } RELEASE(opt); } diff --git a/Build/source/texk/dvipdfm-x/pdfdev.c b/Build/source/texk/dvipdfm-x/pdfdev.c index b7d2d9a5b82..6c0c5d7c7c3 100644 --- a/Build/source/texk/dvipdfm-x/pdfdev.c +++ b/Build/source/texk/dvipdfm-x/pdfdev.c @@ -1321,8 +1321,6 @@ pdf_close_device (void) RELEASE(dev_fonts[i].tex_name); if (dev_fonts[i].resource) pdf_release_obj(dev_fonts[i].resource); - if (dev_fonts[i].cff_charsets) - cff_release_charsets(dev_fonts[i].cff_charsets); dev_fonts[i].tex_name = NULL; dev_fonts[i].resource = NULL; dev_fonts[i].cff_charsets = NULL; |