summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-07-19 02:58:23 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-07-19 02:58:23 +0000
commitb82f1f668f7e2e34ee53b4b1f7638cf069cbeb82 (patch)
treeed91a491d63d5a833c28b5060ebe59dbf18994f5 /Build
parent12587cf3855189815d9f537512932389a5dbb0d6 (diff)
use getnullstr(), as in pdftex, in most cases in maketexstring()
git-svn-id: svn://tug.org/texlive/trunk@34659 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog5
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c5
2 files changed, 10 insertions, 0 deletions
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 <kakuto@fuk.kinidai.ac.jp>
+
+ * texmfmp.c: Use getnullstr() in maketexstring(), as in pdfTeX,
+ in most cases in order to avoid an assertion error.
+
2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* 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