X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.c;h=d75dbac212a36a6f10ebb0e23a40bf54f580eaa6;hb=c5ad4956c7ff5e7458c23b37d9fea9a3084602a2;hp=10b6073fe1ff9960bac98ac473146a8a3e00a575;hpb=efbb7fcd1fc143a046cfa4b44dbb527b248e110b;p=paraslash.git

diff --git a/string.c b/string.c
index 10b6073f..d75dbac2 100644
--- a/string.c
+++ b/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -380,14 +380,13 @@ int for_each_line(unsigned flags, char *buf, size_t size,
 		char *next_cr;
 
 		next_cr = memchr(start, '\n', buf + size - start);
-		next_null = memchr(start, '\0', buf + size - start);
+		next_null = memchr(start, '\0', next_cr?
+			next_cr - start : buf + size - start);
 		if (!next_cr && !next_null)
 			break;
-		if (next_cr && next_null) {
-			end = next_cr < next_null? next_cr : next_null;
-		} else if (next_null) {
+		if (next_null)
 			end = next_null;
-		} else
+		else
 			end = next_cr;
 		num_lines++;
 		if (!(flags & FELF_DISCARD_FIRST) || start != buf) {