Fix invalid pointer arithmetic.

[nmh] / sbr / ruserpass.c

diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index 610f32a5c3b9c16d6f6821a3f0695525f86c9707..5c47aa114a733872bf013af3b38d9b5087918db9 100644 (file)
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -1,4 +1,5 @@
-/*
+/* ruserpass.c -- parse .netrc-format file.
+ *

  * Portions of this code are
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.
  * Portions of this code are
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.


@@ -26,6 +27,7 @@
 
 static FILE *cfile;
 
 
 static FILE *cfile;
 

+#define TOK_EOF 0

 #define        DEFAULT 1
 #define        LOGIN   2
 #define        PASSWD  3
 #define        DEFAULT 1
 #define        LOGIN   2
 #define        PASSWD  3


@@ -34,7 +36,7 @@ static FILE *cfile;
 #define        ID      10
 #define        MACH    11
 
 #define        ID      10
 #define        MACH    11
 

-#define MAX_TOKVAL_SIZE 1024
+#define MAX_TOKVAL_SIZE 1024 /* Including terminating NUL. */

 
 struct toktab {
     char *tokstr;
 
 struct toktab {
     char *tokstr;


@@ -42,6 +44,7 @@ struct toktab {
 };
 
 static struct toktab toktabs[] = {
 };
 
 static struct toktab toktabs[] = {

+    { "",         TOK_EOF },

     { "default",  DEFAULT },
     { "login",    LOGIN },
     { "password", PASSWD },
     { "default",  DEFAULT },
     { "login",    LOGIN },
     { "password", PASSWD },


@@ -78,7 +81,7 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
            switch(t) {
            case DEFAULT:
                usedefault = 1;
            switch(t) {
            case DEFAULT:
                usedefault = 1;

-               /* FALL THROUGH */
+               /* FALLTHRU */

 
            case MACH:
                if (!usedefault) {
 
            case MACH:
                if (!usedefault) {


@@ -105,8 +108,8 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
                            (stb.st_mode & 077) != 0) {
                            /* We make this a fatal error to force the
                               user to correct it. */
                            (stb.st_mode & 077) != 0) {
                            /* We make this a fatal error to force the
                               user to correct it. */

-                           advise(NULL, "Error - file %s must not be world or "
-                                  "group readable.", credentials_file);
+                            inform("group or other permissions, %#o, "
+                                "forbidden: %s", stb.st_mode, credentials_file);

                            adios(NULL, "Remove password or correct file "
                                  "permissions.");
                        }
                            adios(NULL, "Remove password or correct file "
                                  "permissions.");
                        }


@@ -145,10 +148,10 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
        }
        printf("Name (%s:%s): ", host, myname);
 
        }
        printf("Name (%s:%s): ", host, myname);
 

-       if (fgets(tmp, sizeof(tmp) - 1, stdin) == NULL) {
+       if (fgets(tmp, sizeof tmp, stdin) == NULL) {

            advise ("tmp", "fgets");
        }
            advise ("tmp", "fgets");
        }

-        TrimSuffixC(tmp, '\n');
+        trim_suffix_c(tmp, '\n');

        if (*tmp != '\0' || myname == NULL) {
            myname = tmp;
        }
        if (*tmp != '\0' || myname == NULL) {
            myname = tmp;
        }


@@ -175,46 +178,47 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
 static int
 token(char *tokval)
 {
 static int
 token(char *tokval)
 {

-    char *cp;

     int c;
     int c;

+    const char normalStop[] = "\t\n ,"; /* Each breaks a word. */
+    const char *stop;
+    char *cp;

     struct toktab *t;
 
     struct toktab *t;
 

-    if (feof(cfile))
-       return (0);
-    while ((c = getc(cfile)) != EOF &&
-          (c == '\n' || c == '\t' || c == ' ' || c == ','))
-       continue;
+    if (feof(cfile) || ferror(cfile))
+       return TOK_EOF;
+
+    stop = normalStop;
+    while ((c = getc(cfile)) != EOF && c && strchr(stop, c))
+        ;

     if (c == EOF)
     if (c == EOF)

-       return (0);
+       return TOK_EOF;
+

     cp = tokval;
     cp = tokval;

-    if (c == '"') {
-       while ((c = getc(cfile)) != EOF && c != '"') {
-           if (c == '\\')
-               c = getc(cfile);
-           *cp++ = c;
-            if (cp - tokval > MAX_TOKVAL_SIZE-1) {
-                adios(NULL, "credential tokens restricted to length %d",
-                      MAX_TOKVAL_SIZE - 1);
-            }
-       }
-    } else {
-       *cp++ = c;
-       while ((c = getc(cfile)) != EOF
-              && c != '\n' && c != '\t' && c != ' ' && c != ',') {
-           if (c == '\\')
-               c = getc(cfile);
-           *cp++ = c;
-            if (cp - tokval > MAX_TOKVAL_SIZE-1) {
-                adios(NULL, "credential tokens restricted to length %d",
-                      MAX_TOKVAL_SIZE - 1);
-            }
-       }
+    if (c == '"')
+        /* FIXME: Where is the quoted-string syntax of netrc documented?
+         * This code treats «"foo""bar"» as two tokens without further
+         * separators. */
+        stop = "\"";
+    else
+        /* Might be backslash.  Get it again later.  It's handled then. */
+        if (ungetc(c, cfile) == EOF)
+            return TOK_EOF;
+
+    while ((c = getc(cfile)) != EOF && c && !strchr(stop, c)) {
+        if (c == '\\' && (c = getc(cfile)) == EOF)
+            return TOK_EOF; /* Discard whole token. */
+
+        *cp++ = c;
+        if (cp - tokval > MAX_TOKVAL_SIZE-1) {
+            adios(NULL, "credential tokens restricted to length %d",
+                  MAX_TOKVAL_SIZE - 1);
+        }

     }
     }

-    *cp = 0;
-    if (tokval[0] == 0)
-       return (0);
+    *cp = '\0';
+

     for (t = toktabs; t->tokstr; t++)
        if (!strcmp(t->tokstr, tokval))
     for (t = toktabs; t->tokstr; t++)
        if (!strcmp(t->tokstr, tokval))

-           return (t->tval);
-    return (ID);
+           return t->tval;
+
+    return ID;

 }
 }