texlive[49324] Build/source/texk/ps2pk: check for missing args, more

[commits+hironobu at tug.org]

Revision: 49324
          http://tug.org/svn/texlive?view=revision&revision=49324
Author:   hironobu
Date:     2018-12-05 14:00:50 +0100 (Wed, 05 Dec 2018)
Log Message:
-----------
check for missing args, more

Modified Paths:
--------------
    trunk/Build/source/texk/ps2pk/ChangeLog
    trunk/Build/source/texk/ps2pk/mag.c
    trunk/Build/source/texk/ps2pk/pk2bm.c

Modified: trunk/Build/source/texk/ps2pk/ChangeLog
===================================================================
--- trunk/Build/source/texk/ps2pk/ChangeLog	2018-12-05 01:23:10 UTC (rev 49323)
+++ trunk/Build/source/texk/ps2pk/ChangeLog	2018-12-05 13:00:50 UTC (rev 49324)
@@ -1,3 +1,7 @@
+2018-12-05  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* mag.c, pk2bm.c: check for missing arguments.
+
 2018-12-01  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
 
 	* ps2pk.c: check for missing arguments.

Modified: trunk/Build/source/texk/ps2pk/mag.c
===================================================================
--- trunk/Build/source/texk/ps2pk/mag.c	2018-12-05 01:23:10 UTC (rev 49323)
+++ trunk/Build/source/texk/ps2pk/mag.c	2018-12-05 13:00:50 UTC (rev 49324)
@@ -104,9 +104,11 @@
       	    if (*++argv[0] == '\0') {
       	       argc--; argv++;
       	    }
+      	    if (argv[0] == '\0') goto invalid;
 	    DPI = atof(argv[0]);
 	    done = 1;
       	    break;
+invalid:
       	 default:
       	    fatal("%s: %c invalid option\n", myname, c);
       	 }

Modified: trunk/Build/source/texk/ps2pk/pk2bm.c
===================================================================
--- trunk/Build/source/texk/ps2pk/pk2bm.c	2018-12-05 01:23:10 UTC (rev 49323)
+++ trunk/Build/source/texk/ps2pk/pk2bm.c	2018-12-05 13:00:50 UTC (rev 49324)
@@ -64,6 +64,7 @@
       	    if (*++argv[0] == '\0') {
       	       argc--;  argv++;
       	    }
+      	    if (argv[0] == '\0') goto invalid;
       	    C = *argv[0];
       	    done = 1; break;
       	 case 'o':
@@ -70,6 +71,7 @@
       	    if (*++argv[0] == '\0') {
       	       argc--;  ++argv;
       	    }
+      	    if (argv[0] == '\0') goto invalid;
       	    C = atoo(argv[0]);
       	    done = 1; break;
       	 case 'H':
@@ -76,6 +78,7 @@
       	    if (*++argv[0] == '\0') {
       	       argc--; argv++;
       	    }
+      	    if (argv[0] == '\0') goto invalid;
       	    h = atoi(argv[0]);
             done=1;
       	    break;
@@ -83,6 +86,7 @@
       	    if (*++argv[0] == '\0') {
       	       argc--; argv++;
       	    }
+      	    if (argv[0] == '\0') goto invalid;
       	    w = atoi(argv[0]);
 	    done=1;
       	    break;
@@ -92,6 +96,7 @@
       	 case 'h':
       	    hexmap = 1;
       	    break;
+invalid:
       	 default:
       	    printf("%s: %c invalid option\n", myname, c);
       	    exit(1);