texlive[62644] Build/source/texk/dvi2tty: dvi2tty: error exit in

[commits+hironobu at tug.org]

Revision: 62644
          http://tug.org/svn/texlive?view=revision&revision=62644
Author:   hironobu
Date:     2022-03-11 23:35:23 +0100 (Fri, 11 Mar 2022)
Log Message:
-----------
dvi2tty: error exit in special case

Modified Paths:
--------------
    trunk/Build/source/texk/dvi2tty/ChangeLog
    trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.c
    trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.h
    trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c

Modified: trunk/Build/source/texk/dvi2tty/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvi2tty/ChangeLog	2022-03-11 22:31:14 UTC (rev 62643)
+++ trunk/Build/source/texk/dvi2tty/ChangeLog	2022-03-11 22:35:23 UTC (rev 62644)
@@ -1,3 +1,11 @@
+2022-03-11  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* dvi2tty.[ch], dvistuff.c: Error exit if fail to get font,
+	to avoid segmentation fault (do not occur in TeX-DVI, but
+	erroneously created in some situation).
+	https://github.com/aminophen/dviasm/issues/20
+	https://github.com/texjporg/tex-jp-build/issues/138
+
 2021-07-18  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* dvi2tty.c, disdvi.c: Apply patch of W32TeX by Kakuto-san.

Modified: trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.c
===================================================================
--- trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.c	2022-03-11 22:31:14 UTC (rev 62643)
+++ trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.c	2022-03-11 22:35:23 UTC (rev 62644)
@@ -751,6 +751,8 @@
         case  pipcr : fprintf(stderr, "Cannot create pipe to pager\n");
                       break;
 #endif
+        case  bdfnt : fprintf(stderr, "Fail to get font information\n");
+                      break;
         default     : fprintf(stderr, "Unkown error code\n");
                       break;
     };

Modified: trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.h
===================================================================
--- trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.h	2022-03-11 22:31:14 UTC (rev 62643)
+++ trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvi2tty.h	2022-03-11 22:35:23 UTC (rev 62644)
@@ -96,6 +96,7 @@
 #if !defined(MSDOS)
 #define pipcr   20              /* cannot creat pipe                 */
 #endif
+#define bdfnt   21              /* fail to get font info             */
 
 
 

Modified: trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c
===================================================================
--- trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c	2022-03-11 22:31:14 UTC (rev 62643)
+++ trunk/Build/source/texk/dvi2tty/dvi2tty-src/dvistuff.c	2022-03-11 22:35:23 UTC (rev 62644)
@@ -1073,6 +1073,7 @@
 void dochar(unsigned char ch)
 {
     char flag;
+    if (!fnt) errorexit(bdfnt);
     flag = fnt->flags;
 
     if (nttj && fnt->fontnum)