From: Yongqiang Tian <yqtian668@gmail.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] compat/winansi: fix die_lasterr() argument formatting
Date: Wed, 16 Sep 2026 14:23:12 +1000 [thread overview]
Message-ID: <20260916042312.35891-1-yqtian668@gmail.com> (raw)
During WinANSI initialization, duplicate_handle() reports the handle
when DuplicateHandle() fails:
die_lasterr("DuplicateHandle(%li) failed", ...);
die_lasterr() collects the formatting arguments in a va_list, but
passes that va_list to die_errno() as an ordinary variadic argument.
die_errno() consequently formats the representation of the va_list
instead of the supplied handle, producing an incorrect fatal message.
The other current callers pass fixed strings and are unaffected.
Git does not provide a va_list-taking variant of die_errno(), so format
the caller's arguments separately with strbuf_vaddf(). This consumes the
original va_list correctly and produces the complete diagnostic prefix,
including the handle supplied by duplicate_handle().
Save GetLastError() before formatting because calls made while growing
the strbuf may change the thread's Windows error value. Convert the
saved value to errno only after formatting, then pass the completed
message to die_errno() through a literal "%s". This prevents any percent
characters in the formatted message from being interpreted a second
time, while allowing die_errno() to append the corresponding system
error and terminate as before.
The updated compat/winansi.c compiles with MinGW GCC 13. A Win64 probe
under Wine prints a value derived from the va_list before this change
and the supplied integer afterward.
Signed-off-by: Yongqiang Tian <yqtian668@gmail.com>
---
compat/winansi.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index 3ce190093..5547192a2 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -7,6 +7,7 @@
#define DISABLE_SIGN_COMPARE_WARNINGS
#include "../git-compat-util.h"
+#include "../strbuf.h"
#include <wingdi.h>
#include <winreg.h>
#include "win32.h"
@@ -438,11 +439,15 @@ static void winansi_exit(void)
static void die_lasterr(const char *fmt, ...)
{
+ DWORD err = GetLastError();
+ struct strbuf message = STRBUF_INIT;
va_list params;
+
va_start(params, fmt);
- errno = err_win_to_posix(GetLastError());
- die_errno(fmt, params);
+ strbuf_vaddf(&message, fmt, params);
va_end(params);
+ errno = err_win_to_posix(err);
+ die_errno("%s", message.buf);
}
#undef dup2
--
2.34.1
next reply other threads:[~2026-09-16 4:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-16 4:23 Yongqiang Tian [this message]
2026-09-16 4:29 ` [PATCH] compat/winansi: fix die_lasterr() argument formatting Junio C Hamano
2026-09-16 6:13 ` Johannes Sixt
2026-09-16 6:33 ` René Scharfe
2026-09-16 7:09 ` Johannes Sixt
2026-09-21 3:00 ` Yongqiang Tian
2026-09-21 4:06 ` Johannes Sixt
2026-09-21 6:20 ` [PATCH v2] " Yongqiang Tian
2026-09-21 17:18 ` Junio C Hamano
2026-09-21 23:49 ` Yongqiang Tian
2026-09-21 23:47 ` [PATCH v3] " Yongqiang Tian
2026-09-23 4:41 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260916042312.35891-1-yqtian668@gmail.com \
--to=yqtian668@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox