26552cb62a
find_cfg_ent() allocates a struct reflog_expire_entry_option via
FLEX_ALLOC_MEM and inserts it into a linked list in the
reflog_expire_options structure. The entries in this list are never
freed, resulting in a leak in cmd_reflog_expire and the gc reflog expire
maintenance task:
Direct leak of 39 byte(s) in 1 object(s) allocated from:
#0 0x7ff975ee6883 in calloc (/lib64/libasan.so.8+0xe6883)
#1 0x0000010edada in xcalloc ../wrapper.c:154
#2 0x000000df0898 in find_cfg_ent ../reflog.c:28
#3 0x000000df0898 in reflog_expire_config ../reflog.c:70
#4 0x00000095c451 in configset_iter ../config.c:2116
#5 0x0000006d29e7 in git_config ../config.h:724
#6 0x0000006d29e7 in cmd_reflog_expire ../builtin/reflog.c:205
#7 0x0000006d504c in cmd_reflog ../builtin/reflog.c:419
#8 0x0000007e4054 in run_builtin ../git.c:480
#9 0x0000007e4054 in handle_builtin ../git.c:746
#10 0x0000007e8a35 in run_argv ../git.c:813
#11 0x0000007e8a35 in cmd_main ../git.c:953
#12 0x000000441e8f in main ../common-main.c:9
#13 0x7ff9754115f4 in __libc_start_call_main (/lib64/libc.so.6+0x35f4)
#14 0x7ff9754116a7 in __libc_start_main@@GLIBC_2.34 (/lib64/libc.so.6+0x36a7)
#15 0x000000444184 in _start (/home/jekeller/libexec/git-core/git+0x444184)
Close this leak by adding a reflog_clear_expire_config() function which
iterates the linked list and frees its elements. Call it upon exit of
cmd_reflog_expire() and reflog_expire_condition().
Add a basic test which covers this leak. While at it, cover the
functionality from commit commit 3cb22b8efe (Per-ref reflog expiry
configuration, 2008-06-15). We've had this support for years, but lacked
any tests.
Co-developed-by: Jeff King <peff@peff.net>
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
77 lines
2.3 KiB
C
77 lines
2.3 KiB
C
#ifndef REFLOG_H
|
|
#define REFLOG_H
|
|
#include "refs.h"
|
|
|
|
#define REFLOG_EXPIRE_TOTAL (1 << 0)
|
|
#define REFLOG_EXPIRE_UNREACH (1 << 1)
|
|
|
|
struct reflog_expire_entry_option {
|
|
struct reflog_expire_entry_option *next;
|
|
timestamp_t expire_total;
|
|
timestamp_t expire_unreachable;
|
|
char pattern[FLEX_ARRAY];
|
|
};
|
|
|
|
struct reflog_expire_options {
|
|
struct reflog_expire_entry_option *entries, **entries_tail;
|
|
int stalefix;
|
|
int explicit_expiry;
|
|
timestamp_t default_expire_total;
|
|
timestamp_t expire_total;
|
|
timestamp_t default_expire_unreachable;
|
|
timestamp_t expire_unreachable;
|
|
int recno;
|
|
};
|
|
#define REFLOG_EXPIRE_OPTIONS_INIT(now) { \
|
|
.default_expire_total = now - 30 * 24 * 3600, \
|
|
.default_expire_unreachable = now - 90 * 24 * 3600, \
|
|
}
|
|
|
|
/*
|
|
* Parse the reflog expire configuration. This should be used with
|
|
* `repo_config()`.
|
|
*/
|
|
int reflog_expire_config(const char *var, const char *value,
|
|
const struct config_context *ctx, void *cb);
|
|
|
|
void reflog_clear_expire_config(struct reflog_expire_options *opts);
|
|
|
|
/*
|
|
* Adapt the options so that they apply to the given refname. This applies any
|
|
* per-reference reflog expiry configuration that may exist to the options.
|
|
*/
|
|
void reflog_expire_options_set_refname(struct reflog_expire_options *cb,
|
|
const char *refname);
|
|
|
|
struct expire_reflog_policy_cb {
|
|
enum {
|
|
UE_NORMAL,
|
|
UE_ALWAYS,
|
|
UE_HEAD
|
|
} unreachable_expire_kind;
|
|
struct commit_list *mark_list;
|
|
unsigned long mark_limit;
|
|
struct reflog_expire_options opts;
|
|
struct commit *tip_commit;
|
|
struct commit_list *tips;
|
|
unsigned int dry_run:1;
|
|
};
|
|
|
|
int reflog_delete(const char *rev, enum expire_reflog_flags flags,
|
|
int verbose);
|
|
void reflog_expiry_cleanup(void *cb_data);
|
|
void reflog_expiry_prepare(const char *refname, const struct object_id *oid,
|
|
void *cb_data);
|
|
int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
|
|
const char *email, timestamp_t timestamp, int tz,
|
|
const char *message, void *cb_data);
|
|
int count_reflog_ent(struct object_id *ooid, struct object_id *noid,
|
|
const char *email, timestamp_t timestamp, int tz,
|
|
const char *message, void *cb_data);
|
|
int should_expire_reflog_ent_verbose(struct object_id *ooid,
|
|
struct object_id *noid,
|
|
const char *email,
|
|
timestamp_t timestamp, int tz,
|
|
const char *message, void *cb_data);
|
|
#endif /* REFLOG_H */
|