undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.6.0' into maint

Browse Source 
* maint-1.6.0:
  test-path-utils: Fix off by one, found by valgrind
  get_sha1_basic(): fix invalid memory access, found by valgrind
This commit is contained in:
Junio C Hamano 2009-01-27 15:23:46 -08:00
commit 899d8dc392
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sha1_name.c
View File

@ -309,7 +309,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
/* basic@{time or number} format to query ref-log */ /* basic@{time or number} format to query ref-log */
reflog_len = at = 0; reflog_len = at = 0;
if (str[len-1] == '}') { if (len && str[len-1] == '}') {
for (at = 0; at < len - 1; at++) { for (at = 0; at < len - 1; at++) {
if (str[at] == '@' && str[at+1] == '{') { if (str[at] == '@' && str[at+1] == '{') {
reflog_len = (len-1) - (at+2); reflog_len = (len-1) - (at+2);

2
test-path-utils.c
View File

@ -3,7 +3,7 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
if (argc == 3 && !strcmp(argv[1], "normalize_absolute_path")) { if (argc == 3 && !strcmp(argv[1], "normalize_absolute_path")) {
char *buf = xmalloc(strlen(argv[2])+1); char *buf = xmalloc(PATH_MAX + 1);
int rv = normalize_absolute_path(buf, argv[2]); int rv = normalize_absolute_path(buf, argv[2]);
assert(strlen(buf) == rv); assert(strlen(buf) == rv);
puts(buf); puts(buf);