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

Correctly notice empty sysroots in solib_find_1

Browse Source 
Some parts of solib_find_1 should only operate if the sysroot
is nonempty after processing, but the logic that checked this
happened before trailing slashes were stripped so empty but
non-NULL sysroots were possible.  This commit moves the logic
so it correctly notices all empty sysroots.

gdb/ChangeLog:

	* solib.c (solib_find_1): Set local variable sysroot to NULL if
	it is the empty string after trailing slashes have been stripped.
This commit is contained in:
Gary Benson 2015-06-25 09:54:12 +01:00
parent a3be80c3c5
commit f8773be1be
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2015-06-25 Gary Benson <gbenson@redhat.com>
* solib.c (solib_find_1): Set local variable sysroot to NULL if
it is the empty string after trailing slashes have been stripped.
2015-06-25 Gary Benson <gbenson@redhat.com>
* exec.c (exec_file_locate_attach): Remove gdb_sysroot NULL check.

18
gdb/solib.c
View File

@ -158,6 +158,7 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
const char *fskind = effective_target_file_system_kind ();
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
char *sysroot = gdb_sysroot;
int prefix_len, orig_prefix_len;
/* If the absolute prefix starts with "target:" but the filesystem
accessed by the target_fileio_* methods is the local filesystem
@ -168,17 +169,16 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
if (is_target_filename (sysroot) && target_filesystem_is_local ())
sysroot += strlen (TARGET_SYSROOT_PREFIX);
if (*sysroot == '\0')
/* Strip any trailing slashes from the absolute prefix. */
prefix_len = orig_prefix_len = strlen (sysroot);
while (prefix_len > 0 && IS_DIR_SEPARATOR (sysroot[prefix_len - 1]))
prefix_len--;
if (prefix_len == 0)
sysroot = NULL;
else
else if (prefix_len != orig_prefix_len)
{
int prefix_len = strlen (sysroot);
/* Remove trailing slashes from absolute prefix. */
while (prefix_len > 0
&& IS_DIR_SEPARATOR (sysroot[prefix_len - 1]))
prefix_len--;
sysroot = savestring (sysroot, prefix_len);
make_cleanup (xfree, sysroot);
}