diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/win32-low.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 9cd72a8..30c7eff 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2018-05-10 Joel Brobecker <brobecker@adacore.com> + + PR server/23158: + * win32-low.c (create_process): Only call gdb_tilde_expand if + inferior_cwd is not NULL. + 2018-05-08 Andrew Burgess <andrew.burgess@embecosm.com> * i387-fp.c (i387_cache_to_xsave): Only write x87 control diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 9f0c4e4..db5dd49 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -556,7 +556,6 @@ create_process (const char *program, char *args, DWORD flags, PROCESS_INFORMATION *pi) { const char *inferior_cwd = get_inferior_cwd (); - std::string expanded_infcwd = gdb_tilde_expand (inferior_cwd); BOOL ret; #ifdef _WIN32_WCE @@ -576,6 +575,7 @@ create_process (const char *program, char *args, if (inferior_cwd != NULL) { + std::string expanded_infcwd = gdb_tilde_expand (inferior_cwd); std::replace (expanded_infcwd.begin (), expanded_infcwd.end (), '/', '\\'); wcwd = alloca ((expanded_infcwd.size () + 1) * sizeof (wchar_t)); @@ -607,7 +607,10 @@ Could not convert the expanded inferior cwd to wide-char.")); TRUE, /* inherit handles */ flags, /* start flags */ NULL, /* environment */ - expanded_infcwd.c_str (), /* current directory */ + /* current directory */ + (inferior_cwd == NULL + ? NULL + : gdb_tilde_expand (inferior_cwd).c_str()), &si, /* start info */ pi); /* proc info */ #endif |