summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-05-31 08:29:32 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-05-31 08:29:32 +0000
commit814a6a719c0ee9ae30b89deaab7d483f071108cd (patch)
treeb525326f95641ce9711e62fa616f6ad400958a1e
parentc31b57573a53ce3637fe67c1a849b6aae6604d4b (diff)
hotfix for a reallocation bug that could cause misnamed
output file names. git-svn-id: svn://tug.org/texlive/trunk@18638 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/mplibdir/mp.w4
2 files changed, 9 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 2d94910882f..7269d232d42 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,8 +1,12 @@
-2010-05-19 Taco Hoekwater <taco@luatex>
+2010-05-31 Taco Hoekwater <taco@luatex.org>
+ * mp.w (mp_set_output_file_name): prevent reallocation of
+ string pool during output file name generation.
+
+2010-05-19 Taco Hoekwater <taco@luatex.org>
* mpost.w: add WEB2CVERSION to the banner.
-2010-04-13 Taco Hoekwater <taco@luatex>
+2010-04-13 Taco Hoekwater <taco@luatex.org>
* new import from luatex repository (HEAD of 0.60.x branch)
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index 43229db5864..03e4740402d 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -1,4 +1,4 @@
-% $Id: mp.w 1219 2010-04-01 09:05:51Z taco $
+% $Id: mp.w 1242 2010-05-31 08:18:21Z taco $
%
% Copyright 2008-2009 Taco Hoekwater.
%
@@ -25953,6 +25953,8 @@ static char *mp_set_output_file_name (MP mp, integer c) {
unsigned old_setting; /* previous |selector| setting */
pool_pointer i; /* indexes into |filename_template| */
integer f; /* field width */
+ str_room(1024); /* have to prevent reallocation of the
+ string pool during this template processing */
if ( mp->job_name==NULL ) mp_open_log_file(mp);
if ( mp->internal[mp_output_template]==0) {
char *s; /* a file extension derived from |c| */