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

Merge branch 'fix'

Browse Source 
* fix:
  read-cache.c: use xcalloc() not calloc()
  apply: fix infinite loop with multiple patches with --index
This commit is contained in:
Junio C Hamano 2006-05-09 13:54:42 -07:00
commit 016cd9f665
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apply.c
View File

@ -19,6 +19,7 @@
// //
static const char *prefix; static const char *prefix;
static int prefix_length = -1; static int prefix_length = -1;
static int newfd = -1;
static int p_value = 1; static int p_value = 1;
static int allow_binary_replacement = 0; static int allow_binary_replacement = 0;
@ -1873,7 +1874,6 @@ static int use_patch(struct patch *p)
static int apply_patch(int fd, const char *filename) static int apply_patch(int fd, const char *filename)
{ {
int newfd;
unsigned long offset, size; unsigned long offset, size;
char *buffer = read_patch_file(fd, &size); char *buffer = read_patch_file(fd, &size);
struct patch *list = NULL, **listp = &list; struct patch *list = NULL, **listp = &list;
@ -1904,12 +1904,11 @@ static int apply_patch(int fd, const char *filename)
size -= nr; size -= nr;
} }
newfd = -1;
if (whitespace_error && (new_whitespace == error_on_whitespace)) if (whitespace_error && (new_whitespace == error_on_whitespace))
apply = 0; apply = 0;
write_index = check_index && apply; write_index = check_index && apply;
if (write_index) if (write_index && newfd < 0)
newfd = hold_index_file_for_update(&cache_file, get_index_file()); newfd = hold_index_file_for_update(&cache_file, get_index_file());
if (check_index) { if (check_index) {
if (read_cache() < 0) if (read_cache() < 0)
@ -1922,12 +1921,6 @@ static int apply_patch(int fd, const char *filename)
if (apply) if (apply)
write_out_results(list, skipped_patch); write_out_results(list, skipped_patch);
if (write_index) {
if (write_cache(newfd, active_cache, active_nr) ||
commit_index_file(&cache_file))
die("Unable to write new cachefile");
}
if (show_index_info) if (show_index_info)
show_index_list(list); show_index_list(list);
@ -2085,5 +2078,12 @@ int main(int argc, char **argv)
whitespace_error == 1 ? "" : "s", whitespace_error == 1 ? "" : "s",
whitespace_error == 1 ? "s" : ""); whitespace_error == 1 ? "s" : "");
} }
if (write_index) {
if (write_cache(newfd, active_cache, active_nr) ||
commit_index_file(&cache_file))
die("Unable to write new cachefile");
}
return 0; return 0;
} }

2
read-cache.c
View File

@ -552,7 +552,7 @@ int read_cache(void)
active_nr = ntohl(hdr->hdr_entries); active_nr = ntohl(hdr->hdr_entries);
active_alloc = alloc_nr(active_nr); active_alloc = alloc_nr(active_nr);
active_cache = calloc(active_alloc, sizeof(struct cache_entry *)); active_cache = xcalloc(active_alloc, sizeof(struct cache_entry *));
offset = sizeof(*hdr); offset = sizeof(*hdr);
for (i = 0; i < active_nr; i++) { for (i = 0; i < active_nr; i++) {