mvadkert / rpms / file

Forked from rpms/file 5 years ago
Clone
Daniel Novotny 88b11f9
diff -up file-5.04/src/softmagic.c.segfault file-5.04/src/softmagic.c
Daniel Novotny 88b11f9
--- file-5.04/src/softmagic.c.segfault	2009-10-19 15:10:20.000000000 +0200
Daniel Novotny 88b11f9
+++ file-5.04/src/softmagic.c	2010-01-28 15:28:20.000000000 +0100
Daniel Novotny 88b11f9
@@ -946,6 +946,7 @@ mcopy(struct magic_set *ms, union VALUET
Daniel Novotny 88b11f9
 			end = last = (const char *)s + nbytes;
Daniel Novotny 88b11f9
 			/* mget() guarantees buf <= last */
Daniel Novotny 88b11f9
 			for (lines = linecnt, b = buf; lines &&
Daniel Novotny 88b11f9
+			     b < end && c < end &&
Daniel Novotny 88b11f9
 			     ((b = CAST(const char *,
Daniel Novotny 88b11f9
 				 memchr(c = b, '\n', CAST(size_t, (end - b)))))
Daniel Novotny 88b11f9
 			     || (b = CAST(const char *,