jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shadow: Move spent parsing to internal function

Browse source
This commit is contained in:
Michael Forney 2013-11-23 22:17:42 -08:00 • committed by Rich Felker
commit b3646b30d6
2 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/passwd/getspnam_r.c
View file

@ -12,9 +12,45 @@
* file. It also avoids any allocation to prevent memory-exhaustion * file. It also avoids any allocation to prevent memory-exhaustion
* attacks via huge TCB shadow files. */ * 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) 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 rv = 0;
int fd; int fd;
size_t k, l = strlen(name); size_t k, l = strlen(name);
char *s;
int skip = 0; int skip = 0;
int cs; int cs;
@ -71,34 +106,8 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
rv = ERANGE; rv = ERANGE;
break; break;
} }
buf[k-1] = 0;
s = buf; if (__parsespent(buf, sp) < 0) continue;
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);
*res = sp; *res = sp;
break; break;
} }

2
src/passwd/pwf.h
View file

@ -9,5 +9,5 @@
#include "libc.h" #include "libc.h"
struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size); struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size);
struct spwd *__getspent_a(FILE *f, struct spwd *sp, char **line, size_t *size);
struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem); struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem);
int __parsespent(char *s, struct spwd *sp);