global: use release_commit_memory()
Instead of calling two separate Git functions to free memory associated with a commit object, use Git's wrapper which does this. This also counts as a potential future bug fix since release_commit_memory() also resets the parsed state of the commit, meaning any attempt to use it in the future will correctly fill out the fields again. release_commit_memory() does not set parents to zero, so keep that for additional safety in case CGit checks this without calling parse_commit() again. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
		
							parent
							
								
									d071f28cfa
								
							
						
					
					
						commit
						4c520cefc9
					
				| @ -149,8 +149,7 @@ void cgit_print_atom(char *tip, const char *path, int max_count) | |||||||
| 			first = false; | 			first = false; | ||||||
| 		} | 		} | ||||||
| 		add_entry(commit, host); | 		add_entry(commit, host); | ||||||
| 		free_commit_buffer(the_repository->parsed_objects, commit); | 		release_commit_memory(the_repository->parsed_objects, commit); | ||||||
| 		free_commit_list(commit->parents); |  | ||||||
| 		commit->parents = NULL; | 		commit->parents = NULL; | ||||||
| 	} | 	} | ||||||
| 	html("</feed>\n"); | 	html("</feed>\n"); | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								ui-log.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								ui-log.c
									
									
									
									
									
								
							| @ -489,8 +489,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||||||
| 	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) { | 	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) { | ||||||
| 		if (show_commit(commit, &rev)) | 		if (show_commit(commit, &rev)) | ||||||
| 			i++; | 			i++; | ||||||
| 		free_commit_buffer(the_repository->parsed_objects, commit); | 		release_commit_memory(the_repository->parsed_objects, commit); | ||||||
| 		free_commit_list(commit->parents); |  | ||||||
| 		commit->parents = NULL; | 		commit->parents = NULL; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| @ -511,8 +510,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||||||
| 			i++; | 			i++; | ||||||
| 			print_commit(commit, &rev); | 			print_commit(commit, &rev); | ||||||
| 		} | 		} | ||||||
| 		free_commit_buffer(the_repository->parsed_objects, commit); | 		release_commit_memory(the_repository->parsed_objects, commit); | ||||||
| 		free_commit_list(commit->parents); |  | ||||||
| 		commit->parents = NULL; | 		commit->parents = NULL; | ||||||
| 	} | 	} | ||||||
| 	if (pager) { | 	if (pager) { | ||||||
|  | |||||||
| @ -241,8 +241,7 @@ static struct string_list collect_stats(const struct cgit_period *period) | |||||||
| 	memset(&authors, 0, sizeof(authors)); | 	memset(&authors, 0, sizeof(authors)); | ||||||
| 	while ((commit = get_revision(&rev)) != NULL) { | 	while ((commit = get_revision(&rev)) != NULL) { | ||||||
| 		add_commit(&authors, commit, period); | 		add_commit(&authors, commit, period); | ||||||
| 		free_commit_buffer(the_repository->parsed_objects, commit); | 		release_commit_memory(the_repository->parsed_objects, commit); | ||||||
| 		free_commit_list(commit->parents); |  | ||||||
| 		commit->parents = NULL; | 		commit->parents = NULL; | ||||||
| 	} | 	} | ||||||
| 	return authors; | 	return authors; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user