From: Jon Turney <jon.turney@dronecode.org.uk>
To: Tom Tromey <tromey@adacore.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH] Handle encoding failures in Windows thread names
Date: Thu, 2 Jun 2022 15:19:21 +0100 [thread overview]
Message-ID: <6f7e3db5-76f4-e21d-edbd-2cd1993a7bdd@dronecode.org.uk> (raw)
In-Reply-To: <20220421143926.2550856-1-tromey@adacore.com>
On 21/04/2022 15:39, Tom Tromey via Gdb-patches wrote:
> Internally at AdaCore, we noticed that the new Windows thread name
> code could fail. First, it might return a zero-length string, but in
> gdb conventions it should return nullptr instead. Second, an encoding
> failure could wind up showing replacement characters to the user; this
> is confusing and not useful; it's better to recognize such errors and
> simply discard the name. This patch makes both of these changes.
> ---
> gdb/nat/windows-nat.c | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c
> index bd1b9459145..7a4e804f891 100644
> --- a/gdb/nat/windows-nat.c
> +++ b/gdb/nat/windows-nat.c
> @@ -119,12 +119,19 @@ windows_thread_info::thread_name ()
> HRESULT result = GetThreadDescription (h, &value);
> if (SUCCEEDED (result))
> {
> - size_t needed = wcstombs (nullptr, value, 0);
> - if (needed != (size_t) -1)
> + int needed = WideCharToMultiByte (CP_ACP, 0, value, -1, nullptr, 0,
> + nullptr, nullptr);
> + if (needed != 0)
> {
> - name.reset ((char *) xmalloc (needed));
> - if (wcstombs (name.get (), value, needed) == (size_t) -1)
> - name.reset ();
> + BOOL used_default = FALSE;
> + gdb::unique_xmalloc_ptr<char> new_name
> + ((char *) xmalloc (needed));
> + if (WideCharToMultiByte (CP_ACP, 0, value, -1,
> + new_name.get (), needed,
> + nullptr, &used_default) == needed
> + && !used_default
> + && strlen (new_name.get ()) > 0)
> + name = std::move (new_name);
> }
> LocalFree (value);
> }
This is probably wrong on Cygwin (as the target encoding should be
Cygwin's conception of the locale, not the Windows codepage).
next prev parent reply other threads:[~2022-06-02 14:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 14:39 Tom Tromey
2022-04-21 15:47 ` Eli Zaretskii
2022-04-26 18:53 ` Tom Tromey
2022-06-02 14:19 ` Jon Turney [this message]
2022-06-02 14:33 ` Tom Tromey
2022-06-02 19:29 ` Jon Turney
2022-06-03 16:19 ` Tom Tromey
2022-06-02 16:07 ` Eli Zaretskii
2022-06-02 19:29 ` Jon Turney
2022-06-03 5:28 ` Eli Zaretskii
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=6f7e3db5-76f4-e21d-edbd-2cd1993a7bdd@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=gdb-patches@sourceware.org \
--cc=tromey@adacore.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).