kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Alex Riesen 2007-04-22 16:12:22 +02:00 committed by Junio C Hamano
parent 2b6854c863
commit 67e22ed58f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
convert.c
View File

@ -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 * Ok, allocate a new buffer, fill it in, and return it
* to let the caller know that we switched buffers on it. * to let the caller know that we switched buffers.
*/ */
nsize = size - stats.crlf; nsize = size - stats.crlf;
buffer = xmalloc(nsize); buffer = xmalloc(nsize);
@ -137,7 +137,7 @@ static char *crlf_to_git(const char *path, const char *src, unsigned long *sizep
} else { } else {
do { do {
unsigned char c = *src++; unsigned char c = *src++;
if (! (c == '\r' && (1 < size && *buffer == '\n'))) if (! (c == '\r' && (1 < size && *src == '\n')))
*dst++ = c; *dst++ = c;
} while (--size); } 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 * Ok, allocate a new buffer, fill it in, and return it
* to let the caller know that we switched buffers on it. * to let the caller know that we switched buffers.
*/ */
nsize = size + stats.lf - stats.crlf; nsize = size + stats.lf - stats.crlf;
buffer = xmalloc(nsize); buffer = xmalloc(nsize);