commit 511df4ecbd147628cb33f556e34d4c0dbfbff51a
author florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Fri Sep 12 19:52:32 2014 +0000
committer florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Fri Sep 12 19:52:32 2014 +0000
tree 3f8583ddfe8886c7b28f7abacd688a7a630b23ea
parent d95f093fab798de09a2562d1bcddd5ae9482d8e6

When piecing together the file name of a vgdb FIFO do not allow
user names and host names containing '/' characters.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14526 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_gdbserver/remote-utils.c

diff --git a/coregrind/m_gdbserver/remote-utils.c b/coregrind/m_gdbserver/remote-utils.c
index aa2cd4a..1b9ce76 100644
--- a/coregrind/m_gdbserver/remote-utils.c
+++ b/coregrind/m_gdbserver/remote-utils.c
@@ -323,10 +323,12 @@
    user = VG_(getenv)("LOGNAME");
    if (user == NULL) user = VG_(getenv)("USER");
    if (user == NULL) user = "???";
+   if (VG_(strchr)(user, '/')) user = "???";
 
    host = VG_(getenv)("HOST");
    if (host == NULL) host = VG_(getenv)("HOSTNAME");
    if (host == NULL) host = "???";
+   if (VG_(strchr)(host, '/')) host = "???";
 
    len = strlen(name) + strlen(user) + strlen(host) + 40;
 

coregrind/vgdb.c

diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c
index d330cb5..160e6ee 100644
--- a/coregrind/vgdb.c
+++ b/coregrind/vgdb.c
@@ -517,10 +517,12 @@
    user = getenv("LOGNAME");
    if (user == NULL) user = getenv("USER");
    if (user == NULL) user = "???";
+   if (strchr(user, '/')) user = "???";
 
    host = getenv("HOST");
    if (host == NULL) host = getenv("HOSTNAME");
    if (host == NULL) host = "???";
+   if (strchr(host, '/')) host = "???";
 
    len = strlen(vgdb_prefix) + strlen(user) + strlen(host) + 40;
    from_gdb_to_pid = vmalloc (len);