X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=klibc_fixups.c;h=d1a452a44981bc948bfb9659db9f0a773d5d3a34;hb=b337e60790382589e8e9f088f0ff41a496a85615;hp=bbacfbdc75cf02ada93fa6cf9aed42c6a1667284;hpb=84df02dd63bf53acb5a61e9db1da067760b927e9;p=elogind.git diff --git a/klibc_fixups.c b/klibc_fixups.c index bbacfbdc7..d1a452a44 100644 --- a/klibc_fixups.c +++ b/klibc_fixups.c @@ -41,8 +41,9 @@ 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; @@ -59,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)