[gentoo-commits] gentoo commit in src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches: 010_all_synctex_coord.patch 020_all_offbyone_enctex_xetex.patch 030_all_line_number_fix.patch 040_all_buffer_overrun.patch 050_all_memory_corruption.patch 060_all_eptex.patch 070_all_luatex_array.patch 080_all_ttf2pk.patch

[Alexis Ballier (aballier)]

aballier    11/11/02 19:42:06

  Added:                010_all_synctex_coord.patch
                        020_all_offbyone_enctex_xetex.patch
                        030_all_line_number_fix.patch
                        040_all_buffer_overrun.patch
                        050_all_memory_corruption.patch 060_all_eptex.patch
                        070_all_luatex_array.patch 080_all_ttf2pk.patch
  Log:
  add (quickly) processed and untested patches, will fix those that may fail later

Revision  Changes    Path
1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/010_all_synctex_coord.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/010_all_synctex_coord.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/010_all_synctex_coord.patch?rev=1.1&content-type=text/plain

Index: 010_all_synctex_coord.patch
===================================================================
r23716 | karl | 2011-08-26 20:29:30 -0300 (Fri, 26 Aug 2011) | 1 line

branch2011: import synctex coordinate fix from trunk r23644
Index: Build/source/texk/web2c/synctexdir/synctex-luatex.h
===================================================================
--- Build/source/texk/web2c/synctexdir/synctex-luatex.h	(revision 23715)
+++ Build/source/texk/web2c/synctexdir/synctex-luatex.h	(revision 23716)
@@ -50,9 +50,12 @@
 #define SYNCTEX_HEIGHT(NODE) height(NODE)
 #define SYNCTEX_VALUE int_par(synctex_code)
 
-#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
-#define SYNCTEX_CURH static_pdf->posstruct->pos.h
+#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
+#define SYNCTEX_CURHH static_pdf->posstruct->pos.h
 
+#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287)
+#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287)
+
 #define SYNCTEX_GET_JOB_NAME() makecstring(job_name)
 #define SYNCTEX_GET_LOG_NAME() get_full_log_name()
 
Index: Build/source/texk/web2c/synctexdir/synctex-xetex.h
===================================================================
--- Build/source/texk/web2c/synctexdir/synctex-xetex.h	(revision 23715)
+++ Build/source/texk/web2c/synctexdir/synctex-xetex.h	(revision 23716)
@@ -57,6 +57,9 @@
 #  define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0)
 #  define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf")
 
+#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh)
+#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv)
+
 /*  WARNING:
     The definition below must be in sync with their eponym declarations in synctex-xetex.ch1
 */



1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/020_all_offbyone_enctex_xetex.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/020_all_offbyone_enctex_xetex.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/020_all_offbyone_enctex_xetex.patch?rev=1.1&content-type=text/plain

Index: 020_all_offbyone_enctex_xetex.patch
===================================================================
r23740 | karl | 2011-08-28 21:14:50 -0300 (Sun, 28 Aug 2011) | 1 line

branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html)
Index: Build/source/texk/web2c/xetexdir/xetex.ch
===================================================================
--- Build/source/texk/web2c/xetexdir/xetex.ch	(revision 23739)
+++ Build/source/texk/web2c/xetexdir/xetex.ch	(revision 23740)
@@ -328,7 +328,7 @@
 {Initialize enc\TeX\ data.}
 for i:=0 to 255 do mubyte_read[i]:=null;
 for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
 mubyte_keep := 0; mubyte_start := false;
 write_noexpanding := false; cs_converting := false;
 special_printing := false; message_printing := false;
Index: Build/source/texk/web2c/enctex.ch
===================================================================
--- Build/source/texk/web2c/enctex.ch	(revision 23739)
+++ Build/source/texk/web2c/enctex.ch	(revision 23740)
@@ -42,7 +42,7 @@
 {Initialize enc\TeX\ data.}
 for i:=0 to 255 do mubyte_read[i]:=null;
 for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
 mubyte_keep := 0; mubyte_start := false;
 write_noexpanding := false; cs_converting := false;
 special_printing := false; message_printing := false;



1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/030_all_line_number_fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/030_all_line_number_fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/030_all_line_number_fix.patch?rev=1.1&content-type=text/plain

Index: 030_all_line_number_fix.patch
===================================================================
r24159 | karl | 2011-09-30 20:23:37 -0300 (Fri, 30 Sep 2011) | 1 line

branch2011: import line number fix from trunk r24155
Index: Build/source/texk/web2c/luatexdir/tex/inputstack.w
===================================================================
--- Build/source/texk/web2c/luatexdir/tex/inputstack.w	(revision 24158)
+++ Build/source/texk/web2c/luatexdir/tex/inputstack.w	(revision 24159)
@@ -307,12 +307,13 @@
                                 print_int(iname - 1);
                             print_char('>');
                         };
-                    } else if (iindex != in_open) {     /* input from a pseudo file */
-                        tprint_nl("l.");
-                        print_int(line_stack[iindex + 1]);
                     } else {
                         tprint_nl("l.");
-                        print_int(line);
+                        if (iindex == in_open) {
+                            print_int(line);
+                        } else {     /* input from a pseudo file */
+                            print_int(line_stack[iindex + 1]);
+                        }
                     }
                     print_char(' ');
                     PSEUDO_PRINT_THE_LINE();
Index: Build/source/texk/web2c/luatexdir/tex/printing.w
===================================================================
--- Build/source/texk/web2c/luatexdir/tex/printing.w	(revision 24158)
+++ Build/source/texk/web2c/luatexdir/tex/printing.w	(revision 24159)
@@ -946,7 +946,7 @@
         if (level == in_open)
             print_int(line);
         else
-            print_int(line_stack[iindex + 1 - (in_open - level)]);
+            print_int(line_stack[level + 1]);
         tprint(": ");
     }
 }
Index: Build/source/texk/web2c/tex.ch
===================================================================
--- Build/source/texk/web2c/tex.ch	(revision 24158)
+++ Build/source/texk/web2c/tex.ch	(revision 24159)
@@ -4532,7 +4532,7 @@
   else begin
     print_nl (""); print (full_source_filename_stack[level]); print (":");
     if level=in_open then print_int (line)
-    else print_int (line_stack[index+1-(in_open-level)]);
+    else print_int (line_stack[level+1]);
     print (": ");
   end;
 end;
Index: Build/source/texk/web2c/tests/wprob.tex
===================================================================
--- Build/source/texk/web2c/tests/wprob.tex	(revision 0)
+++ Build/source/texk/web2c/tests/wprob.tex	(revision 24159)
@@ -0,0 +1,15 @@
+\catcode`\%=14
+
+\catcode`\{=1
+\catcode`\}=2
+\catcode`\#=6
+
+\def\err#1{%
+  \errmessage{Could not open file #1}%
+}
+\scantokens{
+  \err{NoSuchFile.eps}
+} % The message above should be >>./wprob.tex:12: Could not open...<<
+\end
+
+

Index: Build/source/texk/web2c/etexdir/wprob.test
===================================================================
--- Build/source/texk/web2c/etexdir/wprob.test	(revision 0)
+++ Build/source/texk/web2c/etexdir/wprob.test	(revision 24159)
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+# Copyright (C) 2011 Peter Breitenlohner <tex-live@×××.org>
+# You may freely use, modify and/or distribute this file.
+
+rm -rf wprob.*
+cp $srcdir/tests/wprob.tex .
+
+TEXMFCNF=$srcdir/../kpathsea \
+	./etex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
+
+grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
+	wprob.log || exit 1
+
Index: Build/source/texk/web2c/etexdir/etex.ch
===================================================================
--- Build/source/texk/web2c/etexdir/etex.ch	(revision 24158)
+++ Build/source/texk/web2c/etexdir/etex.ch	(revision 24159)
@@ -871,10 +871,9 @@
 @x [22] m.313 l.6809 - e-TeX scan_tokens
 else  begin print_nl("l."); print_int(line);
 @y
-else if index<>in_open then {input from a pseudo file}
-  begin print_nl("l."); print_int(line_stack[index+1]);
-  end
-else  begin print_nl("l."); print_int(line);
+else  begin print_nl("l.");
+  if index=in_open then print_int(line)
+  else print_int(line_stack[index+1]); {input from a pseudo file}
 @z
 %---------------------------------------
 @x [22] m.314 l.6831 - e-TeX basic
Index: Build/source/texk/web2c/alephdir/eobase.ch
===================================================================
--- Build/source/texk/web2c/alephdir/eobase.ch	(revision 24158)
+++ Build/source/texk/web2c/alephdir/eobase.ch	(revision 24159)
@@ -805,10 +805,9 @@
 @x [22] m.313 l.6794 - e-TeX scan_tokens
 else  begin print_nl("l."); print_int(line);
 @y
-else if index<>in_open then {input from a pseudo file}
-  begin print_nl("l."); print_int(line_stack[index+1]);
-  end
-else  begin print_nl("l."); print_int(line);
+else  begin print_nl("l.");
+  if index=in_open then print_int(line)
+  else print_int(line_stack[index+1]); {input from a pseudo file}
 @z
 %---------------------------------------
 @x [22] m.314 l.6814 - e-TeX basic
Index: Build/source/texk/web2c/alephdir/com16bit.ch
===================================================================
--- Build/source/texk/web2c/alephdir/com16bit.ch	(revision 24158)
+++ Build/source/texk/web2c/alephdir/com16bit.ch	(revision 24159)
@@ -2784,7 +2784,7 @@
   else begin
     print_nl (""); print (full_source_filename_stack[level]); print (":");
     if level=in_open then print_int (line)
-    else print_int (line_stack[index+1-(in_open-level)]);
+    else print_int (line_stack[level+1]);
     print (": ");
   end;
 end;
Index: Build/source/texk/web2c/pdftexdir/wprob.test
===================================================================
--- Build/source/texk/web2c/pdftexdir/wprob.test	(revision 0)
+++ Build/source/texk/web2c/pdftexdir/wprob.test	(revision 24159)
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+# Copyright (C) 2011 Peter Breitenlohner <tex-live@×××.org>
+# You may freely use, modify and/or distribute this file.
+
+rm -rf wprob.*
+cp $srcdir/tests/wprob.tex .
+
+TEXMFCNF=$srcdir/../kpathsea \
+	./pdftex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
+
+grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
+	wprob.log || exit 1
+



1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/040_all_buffer_overrun.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/040_all_buffer_overrun.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/040_all_buffer_overrun.patch?rev=1.1&content-type=text/plain

Index: 040_all_buffer_overrun.patch
===================================================================
------------------------------------------------------------------------
r24346 | karl | 2011-10-20 20:50:28 -0300 (Thu, 20 Oct 2011) | 1 line

branch2011: import buffer overrun fix from trunk r24337
------------------------------------------------------------------------
Index: Build/source/texk/dvipsk/dospecial.c
===================================================================
--- Build/source/texk/dvipsk/dospecial.c	(revision 24345)
+++ Build/source/texk/dvipsk/dospecial.c	(revision 24346)
@@ -112,7 +112,7 @@
 fgetboundingbox(char *f, float *llx_p, float *lly_p, float *urx_p, float *ury_p)
 {
    FILE *fp;
-   char buf[BUFSIZ];
+   char buf[BUFSIZ+1];
 
    fp = search(figpath, f, READ);
    if (fp == 0)



1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/050_all_memory_corruption.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/050_all_memory_corruption.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/050_all_memory_corruption.patch?rev=1.1&content-type=text/plain

Index: 050_all_memory_corruption.patch
===================================================================
------------------------------------------------------------------------
r24347 | karl | 2011-10-20 20:54:25 -0300 (Thu, 20 Oct 2011) | 1 line

branch2011: import memory corruption, part of r23592, per Hironori Kitagawa, 19 Oct 2011 07:44:35
------------------------------------------------------------------------
Index: Build/source/texk/web2c/ptexdir/ptex-base.ch
===================================================================
--- Build/source/texk/web2c/ptexdir/ptex-base.ch	(revision 24346)
+++ Build/source/texk/web2c/ptexdir/ptex-base.ch	(revision 24347)
@@ -5855,6 +5855,9 @@
 var @!jc:KANJI_code; {temporary register for KANJI}
 @!sp,@!mp,@!ep:pointer;
 begin@/
+if f=null_font then
+  begin get_jfm_pos:=kchar_type(null_font)(0); return;
+  end;
 jc:=toDVI(kcode);
 sp:=1; { start position }
 ep:=font_num_ext[f]-1; { end position }
@@ -6684,11 +6687,13 @@
 goto main_loop_j+3;
 @#
 main_loop_j+1: space_factor:=1000;
-  fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
-  link(tail):=main_p; tail:=main_p; last_jchr:=tail;
-  fast_get_avail(main_p); info(main_p):=KANJI(cur_chr);
-  link(tail):=main_p; tail:=main_p;
-  cx:=cur_chr; @<Insert kinsoku penalty@>;
+  if main_f<>null_font then
+    begin fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
+    link(tail):=main_p; tail:=main_p; last_jchr:=tail;
+    fast_get_avail(main_p); info(main_p):=KANJI(cur_chr);
+    link(tail):=main_p; tail:=main_p;
+    cx:=cur_chr; @<Insert kinsoku penalty@>;
+  end;
   ins_kp:=false;
 again_2:
   get_next;
@@ -6724,7 +6729,10 @@
 @#
 main_loop_j+3:
   if ins_kp=true then @<Insert |pre_break_penalty| of |cur_chr|@>;
-  @<Look ahead for glue or kerning@>;
+  if main_f<>null_font then 
+    begin @<Look ahead for glue or kerning@>;
+    end
+  else inhibit_glue_flag:=false;
   if ins_kp=false then begin { Kanji -> Kanji }
     goto main_loop_j+1;
   end else if ins_kp=true then begin { Kanji -> Ascii }



1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/060_all_eptex.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/060_all_eptex.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/060_all_eptex.patch?rev=1.1&content-type=text/plain

Index: 060_all_eptex.patch
===================================================================
------------------------------------------------------------------------
r24348 | karl | 2011-10-20 20:59:55 -0300 (Thu, 20 Oct 2011) | 1 line

branch2011: import e-ptex fixes from trunk r23688
------------------------------------------------------------------------
Index: Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0
===================================================================
--- Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0	(revision 24347)
+++ Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0	(revision 24348)
@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
 
@@ -82,21 +82,11 @@
 link(prev_p):=p;
 @z
 
-@x etex.ch l.4126
-  if is_char_node(p) then r:=get_avail
-  else case type(p) of
+@x etex.ch l.4186
   hlist_node,vlist_node: begin r:=get_node(box_node_size);
-    mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
-    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-    end;
 @y
-  if is_char_node(p) then r:=get_avail
-  else case type(p) of
   hlist_node,vlist_node: begin r:=get_node(box_node_size);
     @<Copy the box {\sl Sync\TeX} information@>;
-    mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
-    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-    end;
 @z
 
 @x synctex-e-mem.ch0 l.100
Index: Build/source/texk/web2c/eptexdir/eptex.ech
===================================================================
--- Build/source/texk/web2c/eptexdir/eptex.ech	(revision 24347)
+++ Build/source/texk/web2c/eptexdir/eptex.ech	(revision 24348)
@@ -283,6 +283,19 @@
 othercases goto next_p
 @z
 
+@x e-pTeX: just_copy
+  hlist_node,vlist_node: begin r:=get_node(box_node_size);
+@y
+  dir_node,
+  hlist_node,vlist_node: begin r:=get_node(box_node_size);
+@z
+@x e-pTeX: just_copy
+    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+@y
+    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+    add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+@z
+
 @x e-pTeX: ifcsname l.28620
   buffer[m]:=info(p) mod @'400; incr(m); p:=link(p);
 @y



1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/070_all_luatex_array.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/070_all_luatex_array.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/070_all_luatex_array.patch?rev=1.1&content-type=text/plain

Index: 070_all_luatex_array.patch
===================================================================
------------------------------------------------------------------------
r24363 | karl | 2011-10-22 20:08:32 -0300 (Sat, 22 Oct 2011) | 1 line

branch2011: import luatex array fix from trunk r24353
------------------------------------------------------------------------
Index: Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c
===================================================================
--- Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c	(revision 24362)
+++ Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c	(revision 24363)
@@ -385,7 +385,7 @@
     wrapper->top = io;
 }
 
-static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp) {
+static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp, const size_t bsize) {
     _IO *io = wrapper->top, *iop;
     int wasstopped;
 
@@ -396,7 +396,7 @@
 	free(io);
 	if ( wasstopped ) {
 	    wrapper->top = iop;
-	    if ( sp<(int)(sizeof(stack)/sizeof(stack[0])) ) {
+	    if ( sp<(int)bsize ) {
 		stack[sp].type = ps_bool;
 		stack[sp++].u.tf = true;
 	    }
@@ -1609,7 +1609,7 @@
 	    }
 	  break;
 	  case pt_stop:
-	    sp = ioescapestopped(wrapper,stack,sp);
+	    sp = ioescapestopped(wrapper,stack,sp,sizeof(stack)/sizeof(stack[0]));
 	  break;
 	  case pt_load:
 	    if ( sp>=1 && stack[sp-1].type==ps_lit ) {



1.1                  src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/080_all_ttf2pk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/080_all_ttf2pk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/upstream/gentoo_branch2011_patches/080_all_ttf2pk.patch?rev=1.1&content-type=text/plain

Index: 080_all_ttf2pk.patch
===================================================================
------------------------------------------------------------------------
r24460 | peter | 2011-11-02 12:38:52 -0300 (Wed, 02 Nov 2011) | 1 line

branch2011: import ttf2pk bug fix from trunk r24454
------------------------------------------------------------------------
Index: Build/source/texk/ttf2pk/ttf2pk.c
===================================================================
--- Build/source/texk/ttf2pk/ttf2pk.c	(revision 24459)
+++ 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)
     {