texlive[43474] Build/source/texk/web2c/lib: texmfmp.c: Adopt

[commits+kakuto at tug.org]

Revision: 43474
          http://tug.org/svn/texlive?view=revision&revision=43474
Author:   kakuto
Date:     2017-03-12 10:57:06 +0100 (Sun, 12 Mar 2017)
Log Message:
-----------
texmfmp.c: Adopt Jonathan's fix for http://tug.org/pipermail/xetex/2017-January/026975.html

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/lib/ChangeLog
    trunk/Build/source/texk/web2c/lib/texmfmp.c

Modified: trunk/Build/source/texk/web2c/lib/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/lib/ChangeLog	2017-03-12 08:47:36 UTC (rev 43473)
+++ trunk/Build/source/texk/web2c/lib/ChangeLog	2017-03-12 09:57:06 UTC (rev 43474)
@@ -1,3 +1,7 @@
+2017-03-12  Akira Kakuto  <kakuto at fuk.kinidai.ac.jp>
+
+	* texmfmp.c: Adopt Jonathan's solution for the Change on 2017-02-01.
+
 2017-02-13  Akira Kakuto  <kakuto at fuk.kinidai.ac.jp>
 
 	* texmfmp.c: unsigned long long >= 0. Thanks Luigi.

Modified: trunk/Build/source/texk/web2c/lib/texmfmp.c
===================================================================
--- trunk/Build/source/texk/web2c/lib/texmfmp.c	2017-03-12 08:47:36 UTC (rev 43473)
+++ trunk/Build/source/texk/web2c/lib/texmfmp.c	2017-03-12 09:57:06 UTC (rev 43474)
@@ -2818,9 +2818,10 @@
   unsigned bytesToWrite = 0;
   poolpointer len, i, j;
   string name;
-  if (strstart[s + 1 - 65536L] < strstart[s - 65536L])
-    return NULL;
-  len = strstart[s + 1 - 65536L] - strstart[s - 65536L];
+  if (s >= 65536L)
+    len = strstart[s + 1 - 65536L] - strstart[s - 65536L];
+  else
+    len = 0;
   name = xmalloc(len * 3 + 1); /* max UTF16->UTF8 expansion
                                   (code units, not bytes) */
   for (i = 0, j = 0; i < len; i++) {