texlive[57397] Build/source/texk: makejvf: let's see ...

[commits+hironobu at tug.org]

Revision: 57397
          http://tug.org/svn/texlive?view=revision&revision=57397
Author:   hironobu
Date:     2021-01-12 14:35:29 +0100 (Tue, 12 Jan 2021)
Log Message:
-----------
makejvf: let's see ...

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/makejvf/ChangeLog
    trunk/Build/source/texk/makejvf/main.c

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-01-12 02:27:37 UTC (rev 57396)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-01-12 13:35:29 UTC (rev 57397)
@@ -3,6 +3,7 @@
 	* cmap_read.c, t1_load.c: Fix a bug causing a segfault
 	reported as dvipdfmx-upjf.test test failure. Add missing size
 	tests for the data comparison.
+	https://tug.org/pipermail/tlbuild/2021q1/004765.html
 
 2021-01-09  Shunsaku Hirata  <shunsaku.hirata74 at gmail.com>
 

Modified: trunk/Build/source/texk/makejvf/ChangeLog
===================================================================
--- trunk/Build/source/texk/makejvf/ChangeLog	2021-01-12 02:27:37 UTC (rev 57396)
+++ trunk/Build/source/texk/makejvf/ChangeLog	2021-01-12 13:35:29 UTC (rev 57397)
@@ -1,3 +1,8 @@
+2021-01-12  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* main.c: Add size check to avoid segmentation fault.
+	https://tug.org/pipermail/tlbuild/2021q1/004796.html
+
 2020-04-12  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* main.c, write.c, makejvf.h:

Modified: trunk/Build/source/texk/makejvf/main.c
===================================================================
--- trunk/Build/source/texk/makejvf/main.c	2021-01-12 02:27:37 UTC (rev 57396)
+++ trunk/Build/source/texk/makejvf/main.c	2021-01-12 13:35:29 UTC (rev 57397)
@@ -115,7 +115,7 @@
 	}
 
 	atfmname = xstrdup(argv[optind]);
-	if (FILESTRCASEEQ(&atfmname[strlen(atfmname)-4], ".tfm")) {
+	if (strlen(atfmname)>=4 && FILESTRCASEEQ(&atfmname[strlen(atfmname)-4], ".tfm")) {
 		atfmname[strlen(atfmname)-4] = '\0';
 	}
 
@@ -125,7 +125,7 @@
 	strcat(vfname,".vf");
 
 	vtfmname = xstrdup(argv[optind+1]);
-	if (FILESTRCASEEQ(&vtfmname[strlen(vtfmname)-4], ".tfm")) {
+	if (strlen(vtfmname)>=4 && FILESTRCASEEQ(&vtfmname[strlen(vtfmname)-4], ".tfm")) {
 		vtfmname[strlen(vtfmname)-4] = '\0';
 	}
 	if (FILESTRCASEEQ(&vtfmname[0], &atfmname_base[0])) {
@@ -134,7 +134,7 @@
 	}
 
 	if (kanatfm) {
-		if (FILESTRCASEEQ(&kanatfm[strlen(kanatfm)-4], ".tfm")) {
+		if (strlen(kanatfm)>=4 && FILESTRCASEEQ(&kanatfm[strlen(kanatfm)-4], ".tfm")) {
 			kanatfm[strlen(kanatfm)-4] = '\0';
 		}
 		if (FILESTRCASEEQ(&kanatfm[0], &atfmname_base[0])) {
@@ -168,7 +168,7 @@
 	}
 
 	if (jistfm) {
-		if (FILESTRCASEEQ(&jistfm[strlen(jistfm)-4], ".tfm")) {
+		if (strlen(jistfm)>=4 && FILESTRCASEEQ(&jistfm[strlen(jistfm)-4], ".tfm")) {
 			jistfm[strlen(jistfm)-4] = '\0';
 		}
 		if (FILESTRCASEEQ(&jistfm[0], &atfmname_base[0])) {
@@ -178,7 +178,7 @@
 	}
 
 	if (ucsqtfm) {
-		if (FILESTRCASEEQ(&ucsqtfm[strlen(ucsqtfm)-4], ".tfm")) {
+		if (strlen(ucsqtfm)>=4 && FILESTRCASEEQ(&ucsqtfm[strlen(ucsqtfm)-4], ".tfm")) {
 			ucsqtfm[strlen(ucsqtfm)-4] = '\0';
 		}
 		if (FILESTRCASEEQ(&ucsqtfm[0], &atfmname_base[0])) {