summaryrefslogtreecommitdiff
path: root/Build/source/texk/ttf2pk2
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-11-02 12:58:15 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-11-02 12:58:15 +0000
commit723a2828c03409a8800d084db1ad14a98f0b9693 (patch)
tree26640481f47d5c68acbea8a7182d648f0cb41602 /Build/source/texk/ttf2pk2
parent4666bd3fb37c4c7ddec453bf45810d832e27523c (diff)
ttf2pk, ttf2pk2: Bug fix: mapfiles is malloc()ed, so do not realloc() mapfiles+offset
git-svn-id: svn://tug.org/texlive/trunk@24454 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ttf2pk2')
-rw-r--r--Build/source/texk/ttf2pk2/ChangeLog12
-rw-r--r--Build/source/texk/ttf2pk2/ttf2pk.c6
2 files changed, 17 insertions, 1 deletions
diff --git a/Build/source/texk/ttf2pk2/ChangeLog b/Build/source/texk/ttf2pk2/ChangeLog
index 598c28ec586..5ad94e6e1d2 100644
--- a/Build/source/texk/ttf2pk2/ChangeLog
+++ b/Build/source/texk/ttf2pk2/ChangeLog
@@ -1,3 +1,15 @@
+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-10-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * data/HKSCS.sfd: New file copied from Master (r3283).
+ * data/U*.sfd: Updated from Master (r3283).
+ * data/ttfonts.map: Updated from Master (r22207).
+ * Makefile.am ({cfg,enc,map,sfd}data_DATA): Install data files.
+
2011-05-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* ttfaux.c (readttf_kern): Rewrite, using FT_Get_Kerning().
diff --git a/Build/source/texk/ttf2pk2/ttf2pk.c b/Build/source/texk/ttf2pk2/ttf2pk.c
index 5ef405e1c3e..40c81083bc6 100644
--- a/Build/source/texk/ttf2pk2/ttf2pk.c
+++ b/Build/source/texk/ttf2pk2/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)
{