summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-04-22 14:12:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-22 17:44:38 (GMT)
commit67e22ed58f776372de5ed0a5e6fb329bc24b52b2 (patch)
tree19272a5a2af8f6c292df7d01f5aadd56762e4bd1
parent2b6854c863ae83dd8b4766a159a45a02e883a41f (diff)
downloadgit-67e22ed58f776372de5ed0a5e6fb329bc24b52b2.zip
git-67e22ed58f776372de5ed0a5e6fb329bc24b52b2.tar.gz
git-67e22ed58f776372de5ed0a5e6fb329bc24b52b2.tar.bz2
Fix a typo in crlf conversion code
Also, noticed by valgrind: the code caused a read out-of-bounds. Some comments updated as well (they still reflected old calling conventions). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--convert.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/convert.c b/convert.c
index 37239ac..ad106ef 100644
--- a/convert.c
+++ b/convert.c
@@ -115,8 +115,8 @@ static char *crlf_to_git(const char *path, const char *src, unsigned long *sizep
}
/*
- * Ok, allocate a new buffer, fill it in, and return true
- * to let the caller know that we switched buffers on it.
+ * Ok, allocate a new buffer, fill it in, and return it
+ * to let the caller know that we switched buffers.
*/
nsize = size - stats.crlf;
buffer = xmalloc(nsize);
@@ -137,7 +137,7 @@ static char *crlf_to_git(const char *path, const char *src, unsigned long *sizep
} else {
do {
unsigned char c = *src++;
- if (! (c == '\r' && (1 < size && *buffer == '\n')))
+ if (! (c == '\r' && (1 < size && *src == '\n')))
*dst++ = c;
} while (--size);
}
@@ -180,8 +180,8 @@ static char *crlf_to_worktree(const char *path, const char *src, unsigned long *
}
/*
- * Ok, allocate a new buffer, fill it in, and return true
- * to let the caller know that we switched buffers on it.
+ * Ok, allocate a new buffer, fill it in, and return it
+ * to let the caller know that we switched buffers.
*/
nsize = size + stats.lf - stats.crlf;
buffer = xmalloc(nsize);