X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=klibc_fixups.c;h=d1a452a44981bc948bfb9659db9f0a773d5d3a34;hb=33eae955e24feb2e473b905d64de17ad641e57e0;hp=c4d44bbc490d3dd27752628fca1ac1fe9a7bdc58;hpb=e5a2989efbae81f40b60885a8f92ea1f87df7ea9;p=elogind.git diff --git a/klibc_fixups.c b/klibc_fixups.c index c4d44bbc4..d1a452a44 100644 --- a/klibc_fixups.c +++ b/klibc_fixups.c @@ -37,14 +37,13 @@ #define GR_FILE "/etc/group" #define UTMP_FILE "/var/run/utmp" -_syscall1(int, sysinfo, struct sysinfo *, info); - /* return the id of a passwd style line, selected by the users name */ static unsigned long get_id_by_name(const char *uname, const char *dbfile) { unsigned long id = -1; - char line[255]; + char line[LINE_SIZE]; char *buf; + char *bufline; size_t bufsize; size_t cur; size_t count; @@ -61,19 +60,19 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile) } /* loop through the whole file */ - cur = 0; - while (1) { + while (cur < bufsize) { count = buf_get_line(buf, bufsize, cur); + bufline = &buf[cur]; + cur += count+1; + + if (count >= LINE_SIZE) + continue; - strncpy(line, buf + cur, count); + strncpy(line, bufline, count); line[count] = '\0'; pos = line; - cur += count+1; - if (cur > bufsize) - break; - /* get name */ name = strsep(&pos, ":"); if (name == NULL)