OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix logic in exec_file_locate_attach

Browse Source 
This commit fixes an error in exec_file_locate_attach where
the main executable could be loaded from outside the sysroot
if a nonempty, non-"target:" sysroot was set but the discovered
executable filename did not exist in that sysroot and did exist
on the main filesystem.

gdb/ChangeLog:

	* exec.c (exec_file_locate_attach): Do not attempt to
	locate main executable locally if not found in sysroot.

gdb/testsuite/ChangeLog:

	* gdb.base/attach-pie-noexec.exp: Do not expect an error
	message on attach.
This commit is contained in:
Gary Benson 2016-02-24 11:31:58 +00:00
parent 6735952f7c
commit bf74e428bc
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2016-02-24 Gary Benson <gbenson@redhat.com>
* exec.c (exec_file_locate_attach): Do not attempt to
locate main executable locally if not found in sysroot.
2016-02-24 Joel Brobecker <brobecker@adacore.com>
GDB 7.11 released.

9
gdb/exec.c
View File

@ -156,9 +156,12 @@ exec_file_locate_attach (int pid, int from_tty)
/* If gdb_sysroot is not empty and the discovered filename
is absolute then prefix the filename with gdb_sysroot. */
if (*gdb_sysroot != '\0' && IS_ABSOLUTE_PATH (exec_file))
full_exec_path = exec_file_find (exec_file, NULL);
if (full_exec_path == NULL)
{
full_exec_path = exec_file_find (exec_file, NULL);
if (full_exec_path == NULL)
return;
}
else
{
/* It's possible we don't have a full path, but rather just a
filename. Some targets, such as HP-UX, don't provide the

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2016-02-24 Gary Benson <gbenson@redhat.com>
* gdb.base/attach-pie-noexec.exp: Do not expect an error
message on attach.
2016-02-23 Doug Evans <dje@google.com>
* gdb.base/skip.c (test_skip): New function.

2
gdb/testsuite/gdb.base/attach-pie-noexec.exp
View File

@ -60,7 +60,7 @@ set testpid [spawn_id_get_pid $test_spawn_id]
gdb_start
file delete -- $binfile
gdb_test "attach $testpid" "Attaching to process $testpid\r\n.*: No such file or directory\\." "attach"
gdb_test "attach $testpid" "Attaching to process $testpid\r\n.*" "attach"
gdb_test "set architecture $arch" "The target architecture is assumed to be $arch"
gdb_test "info shared" "From\[ \t\]+To\[ \t\]+Syms Read\[ \t\]+Shared Object Library\r\n0x.*"