X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=klibc_fixups.c;h=d1a452a44981bc948bfb9659db9f0a773d5d3a34;hb=f608f8ac16889ce0e7e800c7f11dacc558d097c1;hp=eaa240c183fa59c6a34161d21c8ad30ea3d9f9d9;hpb=c81b35c08bbd7789883993ea280e0d3772cce440;p=elogind.git

diff --git a/klibc_fixups.c b/klibc_fixups.c
index eaa240c18..d1a452a44 100644
--- a/klibc_fixups.c
+++ b/klibc_fixups.c
@@ -30,19 +30,20 @@
 
 #include "udev.h"
 #include "klibc_fixups.h"
+#include "udev_lib.h"
 #include "logging.h"
 
 #define PW_FILE		"/etc/passwd"
 #define GR_FILE		"/etc/group"
 #define UTMP_FILE	"/var/run/utmp"
 
-
 /* 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;
@@ -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)