yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two bugs in gdbserver thread name handling

Browse Source 
Simon pointed out that my earlier patch to gdbserver's thread name
code:

    commit 07b3255c3bae7126a0d679f957788560351eb236
    Author: Tom Tromey <tom@tromey.com>
    Date:   Thu Jul 13 17:28:48 2023 -0600

	Filter invalid encodings from Linux thread names

... introduced a regression.  This bug was that the iconv output was
not \0-terminated.

Looking at it, I found another bug as well -- replace_non_ascii would
not \0-terminate, and also would return the wrong pointer

This patch fixes both of them.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31153
This commit is contained in:
Tom Tromey 2023-12-15 07:56:45 -07:00
parent bdb4b8036f
commit 862180a2d1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdbserver/linux-low.cc
View File

@ -7013,11 +7013,13 @@ current_lwp_ptid (void)
}
/* A helper function that copies NAME to DEST, replacing non-printable
characters with '?'. Returns DEST as a convenience. */
characters with '?'. Returns the original DEST as a
convenience. */
static const char *
replace_non_ascii (char *dest, const char *name)
{
const char *result = dest;
while (*name != '\0')
{
if (!ISPRINT (*name))
@ -7026,7 +7028,8 @@ replace_non_ascii (char *dest, const char *name)
*dest++ = *name;
++name;
}
return dest;
*dest = '\0';
return result;
}
const char *
@ -7064,8 +7067,8 @@ linux_process_target::thread_name (ptid_t thread)
else if ((errno == EILSEQ || errno == EINVAL)
&& outbuf < &dest[sizeof (dest) - 2])
*outbuf++ = '?';
*outbuf = '\0';
}
*outbuf = '\0';
iconv_close (handle);
return *dest == '\0' ? nullptr : dest;