proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 07:58:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3064 from rcorre/config-write-fix

Browse Source 
config_write -- handle duplicate section headers when deleting entries
This commit is contained in:
Carlos Martín Nieto 2015-04-23 17:23:04 +02:00
commit 69c333f997
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config_file.c
View File

@ -1460,9 +1460,12 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
* don't loose that information, but we only need to * don't loose that information, but we only need to
* update post_start if we're going to use it in this * update post_start if we're going to use it in this
* iteration. * iteration.
* If the section doesn't match and we are trying to delete an entry
* (value == NULL), we must continue searching; there may be another
* matching section later.
*/ */
if (!section_matches) { if (!section_matches) {
if (!last_section_matched) { if (!last_section_matched || value == NULL) {
reader_consume_line(reader); reader_consume_line(reader);
continue; continue;
} }

38
tests/config/write.c
View File

@ -106,6 +106,44 @@ void test_config_write__delete_value_at_specific_level(void)
git_config_free(cfg); git_config_free(cfg);
} }
/*
* This test exposes a bug where duplicate empty section headers could prevent
* deletion of config entries.
*/
void test_config_write__delete_value_with_duplicate_header(void)
{
const char *file_name = "config-duplicate-header";
const char *entry_name = "remote.origin.url";
git_config *cfg;
git_config_entry *entry;
/* This config can occur after removing and re-adding the origin remote */
const char *file_content =
"[remote \"origin\"]\n" \
"[branch \"master\"]\n" \
" remote = \"origin\"\n" \
"[remote \"origin\"]\n" \
" url = \"foo\"\n";
/* Write the test config and make sure the expected entry exists */
cl_git_mkfile(file_name, file_content);
cl_git_pass(git_config_open_ondisk(&cfg, file_name));
cl_git_pass(git_config_get_entry(&entry, cfg, entry_name));
/* Delete that entry */
cl_git_pass(git_config_delete_entry(cfg, entry_name));
/* Reopen the file and make sure the entry no longer exists */
git_config_entry_free(entry);
git_config_free(cfg);
cl_git_pass(git_config_open_ondisk(&cfg, file_name));
cl_git_fail(git_config_get_entry(&entry, cfg, entry_name));
/* Cleanup */
git_config_entry_free(entry);
git_config_free(cfg);
}
void test_config_write__write_subsection(void) void test_config_write__write_subsection(void)
{ {
git_config *cfg; git_config *cfg;