[PATCH 10/23] Avoid writing to buffer in add_excludes_from_file_1()
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:47:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
In the next patch, the buffer that is being used within add_excludes_from_file_1() comes from another function and does not have extra space to put \n at the end. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> Signed-off-by: Junio C Hamano <redacted> --- dir.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dir.c b/dir.c
index e05b850..1170d64 100644
--- a/dir.c
+++ b/dir.c@@ -229,10 +229,9 @@ static int add_excludes_from_file_1(const char *fname, if (buf_p) *buf_p = buf; - buf[size++] = '\n'; entry = buf; - for (i = 0; i < size; i++) { - if (buf[i] == '\n') { + for (i = 0; i <= size; i++) { + if (i == size || buf[i] == '\n') { if (entry != buf + i && entry[0] != '#') { buf[i - (i && buf[i-1] == '\r')] = 0; add_exclude(entry, base, baselen, which);
--
1.6.5.2.216.g9c1ec