development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 02:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/bug-fl-va-list-fix'

Browse source 
Fix buggy va_list usage in recent code.

* jk/bug-fl-va-list-fix:
  bug_fl(): correctly initialize trace2 va_list
This commit is contained in:
Junio C Hamano 2022-06-17 10:33:32 -07:00
parent 7f5a382aa5 f8535596aa
commit aa11b94ef8
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
t/helper/test-trace2.c
View file

@ -224,8 +224,8 @@ static int ut_009bug_BUG(int argc, const char **argv)
static int ut_010bug_BUG(int argc, const char **argv) static int ut_010bug_BUG(int argc, const char **argv)
{ {
bug("a bug message"); bug("a %s message", "bug");
BUG("a BUG message"); BUG("a %s message", "BUG");
} }
/* /*

8
usage.c
View file

@ -334,15 +334,17 @@ NORETURN void BUG_fl(const char *file, int line, const char *fmt, ...)
int bug_called_must_BUG; int bug_called_must_BUG;
void bug_fl(const char *file, int line, const char *fmt, ...) void bug_fl(const char *file, int line, const char *fmt, ...)
{ {
va_list ap, cp; va_list ap;
bug_called_must_BUG = 1; bug_called_must_BUG = 1;
va_copy(cp, ap);
va_start(ap, fmt); va_start(ap, fmt);
BUG_vfl_common(file, line, fmt, ap); BUG_vfl_common(file, line, fmt, ap);
va_end(ap); va_end(ap);
trace2_cmd_error_va(fmt, cp);
va_start(ap, fmt);
trace2_cmd_error_va(fmt, ap);
va_end(ap);
} }
#ifdef SUPPRESS_ANNOTATED_LEAKS #ifdef SUPPRESS_ANNOTATED_LEAKS