mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
fix diff-delta bad memory access
It cannot be assumed that the given buffer will never be moved when shrinking the allocated memory size with realloc(). So let's ignore that optimization for now. This patch makes Electric Fence happy on Linux. Signed-off-by: Nicolas Pitre <nico@cam.org> Acked-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
f7a3276bab
commit
639ca54972
@ -199,7 +199,6 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
|
||||
entry->next = hash[i];
|
||||
hash[i] = entry++;
|
||||
hash_count[i]++;
|
||||
entries--;
|
||||
}
|
||||
}
|
||||
|
||||
@ -230,10 +229,6 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
|
||||
}
|
||||
free(hash_count);
|
||||
|
||||
/* If we didn't use all hash entries, free the unused memory. */
|
||||
if (entries)
|
||||
index = realloc(index, memsize - entries * sizeof(*entry));
|
||||
|
||||
return index;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user