diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-11-02 15:38:52 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-11-02 15:38:52 +0000 |
commit | 133f3cff875092602fe45d28451fb9b39020121e (patch) | |
tree | 0c00e349e0ee0e3ef51ee29b66acbc234ba56689 /Build/source | |
parent | c09b503fbe77c6a7d60174b83de99407258b0425 (diff) |
branch2011: import ttf2pk bug fix from trunk r24454
git-svn-id: svn://tug.org/texlive/branches/branch2011@24460 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/ttf2pk/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/ttf2pk/ttf2pk.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog index e2e21a9403e..7b682fda3cd 100644 --- a/Build/source/texk/ttf2pk/ChangeLog +++ b/Build/source/texk/ttf2pk/ChangeLog @@ -1,3 +1,8 @@ +2011-11-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ttf2pk.c (main): Bug fix: mapfiles is malloc()ed, so do not + realloc() mapfiles+offset. + 2011-04-29 Peter Breitenlohner <peb@mppmu.mpg.de> * parse.c, ttfenc.c: Bug fix. Increase buffer size for increased diff --git a/Build/source/texk/ttf2pk/ttf2pk.c b/Build/source/texk/ttf2pk/ttf2pk.c index 5ef405e1c3e..40c81083bc6 100644 --- a/Build/source/texk/ttf2pk/ttf2pk.c +++ b/Build/source/texk/ttf2pk/ttf2pk.c @@ -300,7 +300,8 @@ main(int argc, char** argv) long inenc_array[256]; char *fontname; size_t fontname_len; - char *pk_filename, *tfm_filename, *enc_filename, *map_filename; + char *pk_filename, *tfm_filename, *enc_filename; + char *map_filename = NULL; char *real_ttfname, *real_map_filename; int dpi = 0, ptsize; Boolean hinting = True; @@ -374,11 +375,14 @@ main(int argc, char** argv) p = mapfiles; while (*p) { + if (map_filename) + free(map_filename); map_filename = p; while (*p != '\n') p++; *p++ = '\0'; + map_filename = newstring(map_filename); real_map_filename = TeX_search_map_file(&map_filename); if (!real_map_filename) { |