 a92d8523ce
			
		
	
	a92d8523ce
	
	
	
		
			
			The parse_commit_graph() function takes a 'struct repository *' pointer, but it only ever accesses config settings (either directly or through the .settings field of the repo struct). Move all relevant config settings into the repo_settings struct, and update parse_commit_graph() and its existing callers so that it takes 'struct repo_settings *' instead. Callers of parse_commit_graph() will now need to call prepare_repo_settings() themselves, or initialize a 'struct repo_settings' directly. Prior toab14d0676c(commit-graph: pass a 'struct repository *' in more places, 2020-09-09), parsing a commit-graph was a pure function depending only on the contents of the commit-graph itself. Commitab14d0676cintroduced a dependency on a `struct repository` pointer, and later commits such asb66d84756f(commit-graph: respect 'commitGraph.readChangedPaths', 2020-09-09) added dependencies on config settings, which were accessed through the `settings` field of the repository pointer. This field was initialized via a call to `prepare_repo_settings()`. Additionally, this fixes an issue in fuzz-commit-graph: In44c7e62(2021-12-06, repo-settings:prepare_repo_settings only in git repos), prepare_repo_settings was changed to issue a BUG() if it is called by a process whose CWD is not a Git repository. The combination of commits mentioned above broke fuzz-commit-graph, which attempts to parse arbitrary fuzzing-engine-provided bytes as a commit graph file. Prior to this change, parse_commit_graph() called prepare_repo_settings(), but since we run the fuzz tests without a valid repository, we are hitting the BUG() from44c7e62for every test case. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			28 lines
		
	
	
		
			836 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			28 lines
		
	
	
		
			836 B
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "commit-graph.h"
 | |
| #include "repository.h"
 | |
| 
 | |
| struct commit_graph *parse_commit_graph(struct repo_settings *s,
 | |
| 					void *graph_map, size_t graph_size);
 | |
| 
 | |
| int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 | |
| 
 | |
| int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 | |
| {
 | |
| 	struct commit_graph *g;
 | |
| 
 | |
| 	initialize_the_repository();
 | |
| 	/*
 | |
| 	 * Initialize the_repository with commit-graph settings that would
 | |
| 	 * normally be read from the repository's gitdir. We want to avoid
 | |
| 	 * touching the disk to keep the individual fuzz-test cases as fast as
 | |
| 	 * possible.
 | |
| 	 */
 | |
| 	the_repository->settings.commit_graph_generation_version = 2;
 | |
| 	the_repository->settings.commit_graph_read_changed_paths = 1;
 | |
| 	g = parse_commit_graph(&the_repository->settings, (void *)data, size);
 | |
| 	repo_clear(the_repository);
 | |
| 	free_commit_graph(g);
 | |
| 
 | |
| 	return 0;
 | |
| }
 |