Reinit reader pointer after reading included config file

urkud · urkud · commit 1713653883c3 · 2015-02-13T00:15:16.000+03:00
Fixes libgit2#2869. If included file includes more files, it may reallocate cfg_file->readers, hence invalidate not only `r` pointer, but `result` pointer as well.
diff --git a/src/config_file.c b/src/config_file.c
@@ -1284,6 +1284,7 @@ static int config_parse(git_strmap *values, diskfile_backend *cfg_file, struct r
 				if (result == 0) {
 					result = config_parse(values, cfg_file, r, level, depth+1);
 					r = git_array_get(cfg_file->readers, index);
+					reader = git_array_get(cfg_file->readers, reader_idx);
 				}
 				else if (result == GIT_ENOTFOUND) {
 					giterr_clear();

Original file line number	Diff line number	Diff line change
`@@ -1284,6 +1284,7 @@ static int config_parse(git_strmap values, diskfile_backend cfg_file, struct r`
`1284`	`1284`	`if (result == 0) {`
`1285`	`1285`	`result = config_parse(values, cfg_file, r, level, depth+1);`
`1286`	`1286`	`r = git_array_get(cfg_file->readers, index);`
	`1287`	`+ reader = git_array_get(cfg_file->readers, reader_idx);`
`1287`	`1288`	`}`
`1288`	`1289`	`else if (result == GIT_ENOTFOUND) {`
`1289`	`1290`	`giterr_clear();`