summaryrefslogtreecommitdiffstats
path: root/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch
diff options
context:
space:
mode:
Diffstat (limited to 'office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch')
-rw-r--r--office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch b/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch
new file mode 100644
index 0000000000..446f98fdad
--- /dev/null
+++ b/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch
@@ -0,0 +1,46 @@
+r24460 | peter | 2011-11-02 15:38:52 +0000 (Wed, 02 Nov 2011) | 1 line
+
+branch2011: import ttf2pk bug fix from trunk r24454
+
+Index: Build/source/texk/ttf2pk/ChangeLog
+===================================================================
+--- Build/source/texk/ttf2pk/ChangeLog (revision 24408)
++++ Build/source/texk/ttf2pk/ChangeLog (revision 24460)
+@@ -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
+Index: Build/source/texk/ttf2pk/ttf2pk.c
+===================================================================
+--- Build/source/texk/ttf2pk/ttf2pk.c (revision 24408)
++++ Build/source/texk/ttf2pk/ttf2pk.c (revision 24460)
+@@ -300,7 +300,8 @@
+ 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 @@
+ 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)
+ {