mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
974c919d36
Fix a memory leak in the parse_date_format() function by providing a
new date_mode_release() companion function.
By using this in "t/helper/test-date.c" we can mark the
"t0006-date.sh" test as passing when git is compiled with
SANITIZE=leak, and whitelist it to run under
"GIT_TEST_PASSING_SANITIZE_LEAK=true" by adding
"TEST_PASSES_SANITIZE_LEAK=true" to the test itself.
The other tests that expose this memory leak (i.e. take the
"mode->type == DATE_STRFTIME" branch in parse_date_format()) are
"t6300-for-each-ref.sh" and "t7004-tag.sh". The former is due to an
easily fixed leak in "ref-filter.c", and brings the failures in
"t6300-for-each-ref.sh" down from 51 to 48.
Fixing the remaining leaks will have to wait until there's a
release_revisions() in "revision.c", as they have to do with leaks via
"struct rev_info".
There is also a leak in "builtin/blame.c" due to its call to
parse_date_format() to parse the "blame.date" configuration. However
as it declares a file-level "static struct date_mode blame_date_mode"
to track the data, LSAN will not report it as a leak. It's possible to
get valgrind(1) to complain about it with e.g.:
valgrind --leak-check=full --show-leak-kinds=all ./git -P -c blame.date=format:%Y blame README.md
But let's focus on things LSAN complains about, and are thus
observable with "TEST_PASSES_SANITIZE_LEAK=true". We should get to
fixing memory leaks in "builtin/blame.c", but as doing so would
require some re-arrangement of cmd_blame() let's leave it for some
other time.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
2.2 KiB
C
74 lines
2.2 KiB
C
#ifndef DATE_H
|
|
#define DATE_H
|
|
|
|
/**
|
|
* The date mode type. This has DATE_NORMAL at an explicit "= 0" to
|
|
* accommodate a memset([...], 0, [...]) initialization when "struct
|
|
* date_mode" is used as an embedded struct member, as in the case of
|
|
* e.g. "struct pretty_print_context" and "struct rev_info".
|
|
*/
|
|
enum date_mode_type {
|
|
DATE_NORMAL = 0,
|
|
DATE_HUMAN,
|
|
DATE_RELATIVE,
|
|
DATE_SHORT,
|
|
DATE_ISO8601,
|
|
DATE_ISO8601_STRICT,
|
|
DATE_RFC2822,
|
|
DATE_STRFTIME,
|
|
DATE_RAW,
|
|
DATE_UNIX
|
|
};
|
|
|
|
struct date_mode {
|
|
enum date_mode_type type;
|
|
const char *strftime_fmt;
|
|
int local;
|
|
};
|
|
|
|
#define DATE_MODE_INIT { \
|
|
.type = DATE_NORMAL, \
|
|
}
|
|
|
|
/**
|
|
* Convenience helper for passing a constant type, like:
|
|
*
|
|
* show_date(t, tz, DATE_MODE(NORMAL));
|
|
*/
|
|
#define DATE_MODE(t) date_mode_from_type(DATE_##t)
|
|
struct date_mode *date_mode_from_type(enum date_mode_type type);
|
|
|
|
/**
|
|
* Format <'time', 'timezone'> into static memory according to 'mode'
|
|
* and return it. The mode is an initialized "struct date_mode"
|
|
* (usually from the DATE_MODE() macro).
|
|
*/
|
|
const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
|
|
|
|
/**
|
|
* Parse a date format for later use with show_date().
|
|
*
|
|
* When the "date_mode_type" is DATE_STRFTIME the "strftime_fmt"
|
|
* member of "struct date_mode" will be a malloc()'d format string to
|
|
* be used with strbuf_addftime(), in which case you'll need to call
|
|
* date_mode_release() later.
|
|
*/
|
|
void parse_date_format(const char *format, struct date_mode *mode);
|
|
|
|
/**
|
|
* Release a "struct date_mode", currently only required if
|
|
* parse_date_format() has parsed a "DATE_STRFTIME" format.
|
|
*/
|
|
void date_mode_release(struct date_mode *mode);
|
|
|
|
void show_date_relative(timestamp_t time, struct strbuf *timebuf);
|
|
int parse_date(const char *date, struct strbuf *out);
|
|
int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset);
|
|
int parse_expiry_date(const char *date, timestamp_t *timestamp);
|
|
void datestamp(struct strbuf *out);
|
|
#define approxidate(s) approxidate_careful((s), NULL)
|
|
timestamp_t approxidate_careful(const char *, int *);
|
|
timestamp_t approxidate_relative(const char *date);
|
|
int date_overflows(timestamp_t date);
|
|
time_t tm_to_time_t(const struct tm *tm);
|
|
#endif
|