Commit a7a64d2cadade53175ba27c1a29023278bdc4288
2013-11-02T18:36:34
remote: don't write too much when dealing with multivars We used to move `data_start` forward, which is wrong as that needs to point to the beginning of the buffer in order to perform size calculations. Introduce a `write_start` variable which indicates where we should start writing from, which is what the `data_start` was being wrongly reused to be.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/src/config_file.c b/src/config_file.c
index 6abf606..c7fc320 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -1185,7 +1185,7 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
{
int result, c;
int section_matches = 0, last_section_matched = 0, preg_replaced = 0, write_trailer = 0;
- const char *pre_end = NULL, *post_start = NULL, *data_start;
+ const char *pre_end = NULL, *post_start = NULL, *data_start, *write_start;
char *current_section = NULL, *section, *name, *ldot;
git_filebuf file = GIT_FILEBUF_INIT;
struct reader *reader = git_array_get(cfg->readers, 0);
@@ -1207,6 +1207,8 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
return -1; /* OS error when reading the file */
}
+ write_start = data_start;
+
/* Lock the file */
if (git_filebuf_open(&file, cfg->file_path, 0) < 0)
return -1;
@@ -1291,7 +1293,7 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
/* We've found the variable we wanted to change, so
* write anything up to it */
- git_filebuf_write(&file, data_start, pre_end - data_start);
+ git_filebuf_write(&file, write_start, pre_end - write_start);
preg_replaced = 1;
/* Then replace the variable. If the value is NULL, it
@@ -1300,9 +1302,13 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
git_filebuf_printf(&file, "\t%s = %s\n", name, value);
}
- /* multiline variable? we need to keep reading lines to match */
- if (preg != NULL && section_matches) {
- data_start = post_start;
+ /*
+ * If we have a multivar, we should keep looking for entries,
+ * but only if we're in the right section. Otherwise we'll end up
+ * looping on the edge of a matching and a non-matching section.
+ */
+ if (section_matches && preg != NULL) {
+ write_start = post_start;
continue;
}
@@ -1332,7 +1338,7 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
git_filebuf_write(&file, post_start, reader->buffer.size - (post_start - data_start));
} else {
if (preg_replaced) {
- git_filebuf_printf(&file, "\n%s", data_start);
+ git_filebuf_printf(&file, "\n%s", write_start);
} else {
git_filebuf_write(&file, reader->buffer.ptr, reader->buffer.size);