date: make DATE_MODE thread-safe
date_mode_from_type() modifies a static variable and returns a pointer to it. This is not thread-safe. Most callers of date_mode_from_type() use it via the macro DATE_MODE and pass its result on to functions like show_date(), which take a const pointer and don't modify the struct. Avoid the static storage by putting the variable on the stack and returning the whole struct date_mode. Change functions that take a constant pointer to expect the whole struct instead. Reduce the cost of passing struct date_mode around on 64-bit systems by reordering its members to close the hole between the 32-bit wide .type and the 64-bit aligned .strftime_fmt as well as the alignment hole at the end. sizeof reports 24 before and 16 with this change on x64. Keep .type at the top to still allow initialization without designator -- though that's only done in a single location, in builtin/blame.c. Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
1f49f7506f
commit
9720d23e8c
@ -11,7 +11,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
int16_t tz;
|
||||
timestamp_t ts;
|
||||
enum date_mode_type dmtype;
|
||||
struct date_mode *dm;
|
||||
struct date_mode dm;
|
||||
|
||||
if (size <= 4)
|
||||
/*
|
||||
@ -40,10 +40,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
free(str);
|
||||
|
||||
dm = date_mode_from_type(dmtype);
|
||||
dm->local = local;
|
||||
dm.local = local;
|
||||
show_date(ts, (int)tz, dm);
|
||||
|
||||
date_mode_release(dm);
|
||||
date_mode_release(&dm);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user