Merge branch 'master' into next

diff --git a/ls-files.c b/ls-files.c
index 585f6a7ff2aa4f3bf6c9273bd6f87a2fb37ab64a..3a17e5d8e0e9831700f8632cd3c2aebbdd269750 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
@@ -93,11 +93,12 @@ static int add_excludes_from_file_1(const char *fname,
                close(fd);
                return 0;
        }
-       buf = xmalloc(size);
+       buf = xmalloc(size+1);
        if (read(fd, buf, size) != size)
                goto err;
        close(fd);
 
+       buf[size++] = '\n';
        entry = buf;
        for (i = 0; i < size; i++) {
                if (buf[i] == '\n') {