From b82f1f668f7e2e34ee53b4b1f7638cf069cbeb82 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sat, 19 Jul 2014 02:58:23 +0000 Subject: use getnullstr(), as in pdftex, in most cases in maketexstring() git-svn-id: svn://tug.org/texlive/trunk@34659 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/lib/ChangeLog | 5 +++++ Build/source/texk/web2c/lib/texmfmp.c | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'Build/source/texk/web2c') diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 3874cde447e..39a6d9e98d4 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,8 @@ +2014-07-19 Akira Kakuto + + * texmfmp.c: Use getnullstr() in maketexstring(), as in pdfTeX, + in most cases in order to avoid an assertion error. + 2014-07-15 Peter Breitenlohner * texmfmp.c: Replace the deprecated spawnvp() by _spawnvp(), diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index f7908936ecc..ae274b23d35 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -2590,7 +2590,12 @@ maketexstring(const_string s) UInt32 rval; const unsigned char *cp = (const unsigned char *)s; #endif +#if defined(TeX) && !defined(Aleph) + if (s == NULL || *s == 0) + return getnullstr(); +#else assert (s != 0); +#endif len = strlen(s); checkpoolpointer (poolptr, len); /* in the XeTeX case, this may be more than enough */ #ifdef XeTeX -- cgit v1.2.3