keep user-provided CFLAGS/LDFLAGS separate from those added by configure

[musl] / src / passwd / getspnam_r.c

diff --git a/src/passwd/getspnam_r.c b/src/passwd/getspnam_r.c
index f4d7b35..9233952 100644 (file)
--- a/src/passwd/getspnam_r.c
+++ b/src/passwd/getspnam_r.c
@@ -12,9 +12,45 @@
  * file. It also avoids any allocation to prevent memory-exhaustion
  * attacks via huge TCB shadow files. */
 
-static long xatol(const char *s)
+static long xatol(char **s)
 {
-       return isdigit(*s) ? atol(s) : -1;
+       long x;
+       if (**s == ':' || **s == '\n') return -1;
+       for (x=0; **s-'0'<10U; ++*s) x=10*x+(**s-'0');
+       return x;
+}
+
+int __parsespent(char *s, struct spwd *sp)
+{
+       sp->sp_namp = s;
+       if (!(s = strchr(s, ':'))) return -1;
+       *s = 0;
+
+       sp->sp_pwdp = ++s;
+       if (!(s = strchr(s, ':'))) return -1;
+       *s = 0;
+
+       s++; sp->sp_lstchg = xatol(&s);
+       if (*s != ':') return -1;
+
+       s++; sp->sp_min = xatol(&s);
+       if (*s != ':') return -1;
+
+       s++; sp->sp_max = xatol(&s);
+       if (*s != ':') return -1;
+
+       s++; sp->sp_warn = xatol(&s);
+       if (*s != ':') return -1;
+
+       s++; sp->sp_inact = xatol(&s);
+       if (*s != ':') return -1;
+
+       s++; sp->sp_expire = xatol(&s);
+       if (*s != ':') return -1;
+
+       s++; sp->sp_flag = xatol(&s);
+       if (*s != '\n') return -1;
+       return 0;
 }
 
 static void cleanup(void *p)
@@ -29,7 +65,6 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
        int rv = 0;
        int fd;
        size_t k, l = strlen(name);
-       char *s;
        int skip = 0;
        int cs;
 
@@ -63,7 +98,7 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
 
        pthread_cleanup_push(cleanup, f);
        while (fgets(buf, size, f) && (k=strlen(buf))>0) {
-               if (skip || strncmp(name, buf, l)) {
+               if (skip || strncmp(name, buf, l) || buf[l]!=':') {
                        skip = buf[k-1] != '\n';
                        continue;
                }
@@ -71,34 +106,8 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
                        rv = ERANGE;
                        break;
                }
-               buf[k-1] = 0;
-
-               s = buf;
-               sp->sp_namp = s;
-               if (!(s = strchr(s, ':'))) continue;
-
-               *s++ = 0; sp->sp_pwdp = s;
-               if (!(s = strchr(s, ':'))) continue;
-
-               *s++ = 0; sp->sp_lstchg = xatol(s);
-               if (!(s = strchr(s, ':'))) continue;
-
-               *s++ = 0; sp->sp_min = xatol(s);
-               if (!(s = strchr(s, ':'))) continue;
-
-               *s++ = 0; sp->sp_max = xatol(s);
-               if (!(s = strchr(s, ':'))) continue;
-
-               *s++ = 0; sp->sp_warn = xatol(s);
-               if (!(s = strchr(s, ':'))) continue;
-
-               *s++ = 0; sp->sp_inact = xatol(s);
-               if (!(s = strchr(s, ':'))) continue;
-
-               *s++ = 0; sp->sp_expire = xatol(s);
-               if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_flag = xatol(s);
+               if (__parsespent(buf, sp) < 0) continue;
                *res = sp;
                break;
        }