mirror of
https://github.com/git/git.git
synced 2024-11-08 12:59:54 +01:00
cc395d6b47
The function `unique_tracking_name()` returns an allocated string, but does not clearly indicate this because its return type is `const char *` instead of `char *`. This has led to various callsites where we never free its returned memory at all, which causes memory leaks. Plug those leaks and mark now-passing tests as leak free. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
1.9 KiB
C
74 lines
1.9 KiB
C
#include "git-compat-util.h"
|
|
#include "object-name.h"
|
|
#include "remote.h"
|
|
#include "refspec.h"
|
|
#include "repository.h"
|
|
#include "checkout.h"
|
|
#include "config.h"
|
|
#include "strbuf.h"
|
|
|
|
struct tracking_name_data {
|
|
/* const */ char *src_ref;
|
|
char *dst_ref;
|
|
struct object_id *dst_oid;
|
|
int num_matches;
|
|
const char *default_remote;
|
|
char *default_dst_ref;
|
|
struct object_id *default_dst_oid;
|
|
};
|
|
|
|
#define TRACKING_NAME_DATA_INIT { 0 }
|
|
|
|
static int check_tracking_name(struct remote *remote, void *cb_data)
|
|
{
|
|
struct tracking_name_data *cb = cb_data;
|
|
struct refspec_item query;
|
|
memset(&query, 0, sizeof(struct refspec_item));
|
|
query.src = cb->src_ref;
|
|
if (remote_find_tracking(remote, &query) ||
|
|
repo_get_oid(the_repository, query.dst, cb->dst_oid)) {
|
|
free(query.dst);
|
|
return 0;
|
|
}
|
|
cb->num_matches++;
|
|
if (cb->default_remote && !strcmp(remote->name, cb->default_remote)) {
|
|
struct object_id *dst = xmalloc(sizeof(*cb->default_dst_oid));
|
|
cb->default_dst_ref = xstrdup(query.dst);
|
|
oidcpy(dst, cb->dst_oid);
|
|
cb->default_dst_oid = dst;
|
|
}
|
|
if (cb->dst_ref) {
|
|
free(query.dst);
|
|
return 0;
|
|
}
|
|
cb->dst_ref = query.dst;
|
|
return 0;
|
|
}
|
|
|
|
char *unique_tracking_name(const char *name, struct object_id *oid,
|
|
int *dwim_remotes_matched)
|
|
{
|
|
struct tracking_name_data cb_data = TRACKING_NAME_DATA_INIT;
|
|
const char *default_remote = NULL;
|
|
if (!git_config_get_string_tmp("checkout.defaultremote", &default_remote))
|
|
cb_data.default_remote = default_remote;
|
|
cb_data.src_ref = xstrfmt("refs/heads/%s", name);
|
|
cb_data.dst_oid = oid;
|
|
for_each_remote(check_tracking_name, &cb_data);
|
|
if (dwim_remotes_matched)
|
|
*dwim_remotes_matched = cb_data.num_matches;
|
|
free(cb_data.src_ref);
|
|
if (cb_data.num_matches == 1) {
|
|
free(cb_data.default_dst_ref);
|
|
free(cb_data.default_dst_oid);
|
|
return cb_data.dst_ref;
|
|
}
|
|
free(cb_data.dst_ref);
|
|
if (cb_data.default_dst_ref) {
|
|
oidcpy(oid, cb_data.default_dst_oid);
|
|
free(cb_data.default_dst_oid);
|
|
return cb_data.default_dst_ref;
|
|
}
|
|
return NULL;
|
|
}
|