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

config: saner iterator errors

Browse Source 
Really report an error in foreach if we fail to allocate the iterator,
and don't fail if the config is emtpy.
This commit is contained in:
Carlos Martín Nieto 2013-08-08 13:14:35 +02:00
parent 82ae6fcdba
commit 84fec6f628
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.c
View File

@ -340,8 +340,10 @@ int git_config_backend_foreach_match(
} }
} }
if (backend->iterator_new(&iter, backend) < 0) if ((result = backend->iterator_new(&iter, backend)) < 0) {
return 0; iter = NULL;
return -1;
}
while(!(backend->next(&entry, iter) < 0)) { while(!(backend->next(&entry, iter) < 0)) {
/* skip non-matching keys if regexp was provided */ /* skip non-matching keys if regexp was provided */

3
src/config_file.c
View File

@ -261,9 +261,6 @@ static int config_iterator_new(
diskfile_backend *b = (diskfile_backend *)backend; diskfile_backend *b = (diskfile_backend *)backend;
git_config_file_iter *it = git__calloc(1, sizeof(git_config_file_iter)); git_config_file_iter *it = git__calloc(1, sizeof(git_config_file_iter));
if (!b->values || git_strmap_num_entries(b->values) < 1)
return -1;
GITERR_CHECK_ALLOC(it); GITERR_CHECK_ALLOC(it);
it->parent.backend = backend; it->parent.backend = backend;