From fa1c74b22aa8c465974ddf792395d8e313199a52 Mon Sep 17 00:00:00 2001 From: Ilya Leoshkevich Date: Wed, 19 Jul 2023 13:27:45 +0200 Subject: gdb: Fix "target file /proc/.../cmdline contained unexpected null characters" When using the gcore command, GDB prints the following warning: (gdb) gcore warning: target file /proc/.../cmdline contained unexpected null characters The reason is that cmdline is read with target_fileio_read_stralloc(), which warns on seeing null characters. However, it's perfectly valid for cmdline to contain \0s, so switch to target_fileio_read_alloc(). Approved-By: Tom Tromey --- gdb/linux-tdep.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 26cf483..5fd64aa 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -1884,15 +1884,23 @@ linux_fill_prpsinfo (struct elf_internal_linux_prpsinfo *p) pid = inferior_ptid.pid (); xsnprintf (filename, sizeof (filename), "/proc/%d/cmdline", (int) pid); /* The full name of the program which generated the corefile. */ - gdb::unique_xmalloc_ptr fname - = target_fileio_read_stralloc (NULL, filename); + gdb_byte *buf = NULL; + size_t buf_len = target_fileio_read_alloc (NULL, filename, &buf); + gdb::unique_xmalloc_ptr fname ((char *)buf); - if (fname == NULL || fname.get ()[0] == '\0') + if (buf_len < 1 || fname.get ()[0] == '\0') { /* No program name was read, so we won't be able to retrieve more information about the process. */ return 0; } + if (fname.get ()[buf_len - 1] != '\0') + { + warning (_("target file %s " + "does not contain a trailing null character"), + filename); + return 0; + } memset (p, 0, sizeof (*p)); -- cgit v1.1