From f0dccfe6c961792b44d7cc9c05a9a5932d5ea13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Thu, 3 May 2012 16:07:22 +0200 Subject: config: don't use freed memory on error Change the order and set a NULL so we don't try to access freed memory in case of an error. --- src/config_file.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/config_file.c b/src/config_file.c index be0977475..3219cca5c 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -258,17 +258,17 @@ static int config_set(git_config_file *cfg, const char *name, const char *value) GITERR_CHECK_ALLOC(var->value); } + if (config_write(b, key, NULL, value) < 0) { + cvar_free(var); + return -1; + } + git_strmap_insert2(b->values, key, var, old_var, rval); if (rval < 0) return -1; if (old_var != NULL) cvar_free(old_var); - if (config_write(b, key, NULL, value) < 0) { - cvar_free(var); - return -1; - } - return 0; } @@ -1021,6 +1021,7 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p pre_end = post_start = cfg->reader.read_ptr; git__free(current_section); + current_section = NULL; if (parse_section_header(cfg, ¤t_section) < 0) goto rewrite_fail; -- cgit v1.2.1 From 0ed572d4f529ff778e4a38b53445912c3e85d2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Thu, 3 May 2012 16:08:33 +0200 Subject: remote: add git_remote_add() Helper function to create a remote with the default settings --- include/git2/remote.h | 10 ++++++++++ src/remote.c | 25 +++++++++++++++++++++++++ tests-clar/network/remotes.c | 12 ++++++++++++ 3 files changed, 47 insertions(+) diff --git a/include/git2/remote.h b/include/git2/remote.h index 7af4148dc..5794f8d16 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -210,6 +210,16 @@ GIT_EXTERN(int) git_remote_valid_url(const char *url); */ GIT_EXTERN(int) git_remote_list(git_strarray *remotes_list, git_repository *repo); +/** + * Add a remote with the default fetch refspec to the repository's configuration + * + * @param out the resulting remote + * @param repo the repository in which to create the remote + * @param name the remote's name + * @param url the remote's url + */ +GIT_EXTERN(int) git_remote_add(git_remote **out, git_repository *repo, const char *name, const char *url); + /** @} */ GIT_END_DECL #endif diff --git a/src/remote.c b/src/remote.c index 98c256929..4dea89e3a 100644 --- a/src/remote.c +++ b/src/remote.c @@ -470,3 +470,28 @@ int git_remote_list(git_strarray *remotes_list, git_repository *repo) return 0; } + +int git_remote_add(git_remote **out, git_repository *repo, const char *name, const char *url) +{ + git_buf buf = GIT_BUF_INIT; + if (git_remote_new(out, repo, url, name) < 0) + return -1; + + if (git_buf_printf(&buf, "refs/heads/*:refs/remotes/%s/*", name) < 0) + goto on_error; + + if (git_remote_set_fetchspec(*out, git_buf_cstr(&buf)) < 0) + goto on_error; + + git_buf_free(&buf); + + if (git_remote_save(*out) < 0) + return -1; + + return 0; + +on_error: + git_buf_free(&buf); + git_remote_free(*out); + return -1; +} diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c index 36b945f9a..c7e4afbbb 100644 --- a/tests-clar/network/remotes.c +++ b/tests-clar/network/remotes.c @@ -132,3 +132,15 @@ void test_network_remotes__list(void) git_config_free(cfg); } + +void test_network_remotes__add(void) +{ + git_remote_free(_remote); + cl_git_pass(git_remote_add(&_remote, _repo, "addtest", "http://github.com/libgit2/libgit2")); + git_remote_free(_remote); + + cl_git_pass(git_remote_load(&_remote, _repo, "addtest")); + _refspec = git_remote_fetchspec(_remote); + cl_assert(!strcmp(git_refspec_src(_refspec), "refs/heads/*")); + cl_assert(!strcmp(git_refspec_dst(_refspec), "refs/remotes/addtest/*")); +} -- cgit v1.2.1 From 8e210931ca5d57b6ca7bc16b41598faa9339bc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Thu, 3 May 2012 20:25:56 +0200 Subject: remotes: change git_remote_new's signature Add a fetch refspec arguemnt and make the arguments (name, url, refspec), as that order makes more sense. --- examples/network/fetch.c | 2 +- examples/network/ls-remote.c | 2 +- include/git2/remote.h | 5 +++-- src/remote.c | 19 +++++++++++++------ tests-clar/network/remotelocal.c | 2 +- tests-clar/network/remotes.c | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/examples/network/fetch.c b/examples/network/fetch.c index 23046bd09..f4a044984 100644 --- a/examples/network/fetch.c +++ b/examples/network/fetch.c @@ -69,7 +69,7 @@ int fetch(git_repository *repo, int argc, char **argv) // Figure out whether it's a named remote or a URL printf("Fetching %s\n", argv[1]); if (git_remote_load(&remote, repo, argv[1]) < 0) { - if (git_remote_new(&remote, repo, argv[1], NULL) < 0) + if (git_remote_new(&remote, repo, NULL, argv[1], NULL) < 0) return -1; } diff --git a/examples/network/ls-remote.c b/examples/network/ls-remote.c index 02d432e8b..958a88651 100644 --- a/examples/network/ls-remote.c +++ b/examples/network/ls-remote.c @@ -19,7 +19,7 @@ int use_unnamed(git_repository *repo, const char *url) // Create an instance of a remote from the URL. The transport to use // is detected from the URL - error = git_remote_new(&remote, repo, url, NULL); + error = git_remote_new(&remote, repo, NULL, url, NULL); if (error < GIT_SUCCESS) goto cleanup; diff --git a/include/git2/remote.h b/include/git2/remote.h index 5794f8d16..41ca7dbac 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -38,11 +38,12 @@ GIT_BEGIN_DECL * * @param out pointer to the new remote object * @param repo the associtated repository - * @param url the remote repository's URL * @param name the remote's name + * @param url the remote repository's URL + * @param fetch the fetch refspec to use for this remote * @return GIT_SUCCESS or an error code */ -GIT_EXTERN(int) git_remote_new(git_remote **out, git_repository *repo, const char *url, const char *name); +GIT_EXTERN(int) git_remote_new(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch); /** * Get the information for a particular remote diff --git a/src/remote.c b/src/remote.c index 4dea89e3a..ca61091e0 100644 --- a/src/remote.c +++ b/src/remote.c @@ -54,7 +54,7 @@ static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const cha return refspec_parse(refspec, val); } -int git_remote_new(git_remote **out, git_repository *repo, const char *url, const char *name) +int git_remote_new(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch) { git_remote *remote; @@ -78,8 +78,17 @@ int git_remote_new(git_remote **out, git_repository *repo, const char *url, cons GITERR_CHECK_ALLOC(remote->name); } + if (fetch != NULL) { + if (refspec_parse(&remote->fetch, fetch) < 0) + goto on_error; + } + *out = remote; return 0; + +on_error: + git_remote_free(remote); + return -1; } int git_remote_load(git_remote **out, git_repository *repo, const char *name) @@ -474,19 +483,17 @@ int git_remote_list(git_strarray *remotes_list, git_repository *repo) int git_remote_add(git_remote **out, git_repository *repo, const char *name, const char *url) { git_buf buf = GIT_BUF_INIT; - if (git_remote_new(out, repo, url, name) < 0) - return -1; if (git_buf_printf(&buf, "refs/heads/*:refs/remotes/%s/*", name) < 0) - goto on_error; + return -1; - if (git_remote_set_fetchspec(*out, git_buf_cstr(&buf)) < 0) + if (git_remote_new(out, repo, name, url, git_buf_cstr(&buf)) < 0) goto on_error; git_buf_free(&buf); if (git_remote_save(*out) < 0) - return -1; + goto on_error; return 0; diff --git a/tests-clar/network/remotelocal.c b/tests-clar/network/remotelocal.c index e154226d9..35fa072ef 100644 --- a/tests-clar/network/remotelocal.c +++ b/tests-clar/network/remotelocal.c @@ -85,7 +85,7 @@ static void connect_to_local_repository(const char *local_repository) { build_local_file_url(&file_path_buf, local_repository); - cl_git_pass(git_remote_new(&remote, repo, git_buf_cstr(&file_path_buf), NULL)); + cl_git_pass(git_remote_new(&remote, repo, NULL, git_buf_cstr(&file_path_buf), NULL)); cl_git_pass(git_remote_connect(remote, GIT_DIR_FETCH)); } diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c index c7e4afbbb..6e5d79b62 100644 --- a/tests-clar/network/remotes.c +++ b/tests-clar/network/remotes.c @@ -57,7 +57,7 @@ void test_network_remotes__save(void) git_remote_free(_remote); /* Set up the remote and save it to config */ - cl_git_pass(git_remote_new(&_remote, _repo, "git://github.com/libgit2/libgit2", "upstream")); + cl_git_pass(git_remote_new(&_remote, _repo, "upstream", "git://github.com/libgit2/libgit2", NULL)); cl_git_pass(git_remote_set_fetchspec(_remote, "refs/heads/*:refs/remotes/upstream/*")); cl_git_pass(git_remote_set_pushspec(_remote, "refs/heads/*:refs/heads/*")); cl_git_pass(git_remote_save(_remote)); -- cgit v1.2.1