diagnose bad V and S lines

SCCS-vsn: usr.sbin/sendmail/src/readcf.c 8.12

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 897037b..7c8d3cb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)readcf.c   8.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c   8.12 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -349,7 +349,15 @@ readcf(cfname)
                        break;
 
                  case 'S':             /* select rewriting set */
                        break;
 
                  case 'S':             /* select rewriting set */

-                       ruleset = atoi(&bp[1]);
+                       for (p = &bp[1]; isascii(*p) && isspace(*p); p++)
+                               continue;
+                       if (!isascii(*p) || !isdigit(*p))
+                       {
+                               syserr("invalid argument to S line: \"%.20s\"", 
+                                       &bp[1]);
+                               break;
+                       }
+                       ruleset = atoi(p);

                        if (ruleset >= MAXRWSETS || ruleset < 0)
                        {
                                syserr("bad ruleset %d (%d max)", ruleset, MAXRWSETS);
                        if (ruleset >= MAXRWSETS || ruleset < 0)
                        {
                                syserr("bad ruleset %d (%d max)", ruleset, MAXRWSETS);


@@ -450,7 +458,15 @@ readcf(cfname)
                        break;
 
                  case 'V':             /* configuration syntax version */
                        break;
 
                  case 'V':             /* configuration syntax version */

-                       ConfigLevel = atoi(&bp[1]);
+                       for (p = &bp[1]; isascii(*p) && isspace(*p); p++)
+                               continue;
+                       if (!isascii(*p) || !isdigit(*p))
+                       {
+                               syserr("invalid argument to V line: \"%.20s\"", 
+                                       &bp[1]);
+                               break;
+                       }
+                       ConfigLevel = atoi(p);

                        if (ConfigLevel >= 5)
                        {
                                /* level 5 configs have short name in $w */
                        if (ConfigLevel >= 5)
                        {
                                /* level 5 configs have short name in $w */