FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* linux-thread-db.c (try_thread_db_load_from_pdir_1): Fix absolute

Browse source 
path check.  Use xmalloc and cleanups.
	(try_thread_db_load_from_dir): Use xmalloc and cleanups.
This commit is contained in:
Tom Tromey 2011-05-18 15:00:55 +00:00
parent dd98f8d276
commit 05386e9ec7
2 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2011-05-18 Tom Tromey <tromey@redhat.com>
* linux-thread-db.c (try_thread_db_load_from_pdir_1): Fix absolute
path check. Use xmalloc and cleanups.
(try_thread_db_load_from_dir): Use xmalloc and cleanups.
2011-05-17 Tom Tromey <tromey@redhat.com> 2011-05-17 Tom Tromey <tromey@redhat.com>
* cp-valprint.c (cp_print_value_fields): Catch errors from * cp-valprint.c (cp_print_value_fields): Catch errors from

58
gdb/linux-thread-db.c
View file

@ -819,29 +819,29 @@ try_thread_db_load (const char *library)
static int static int
try_thread_db_load_from_pdir_1 (struct objfile *obj) try_thread_db_load_from_pdir_1 (struct objfile *obj)
{ {
char path[PATH_MAX], *cp; struct cleanup *cleanup;
char *path, *cp;
int result;
gdb_assert (strlen (obj->name) < sizeof (path)); if (obj->name[0] != '/')
strcpy (path, obj->name);
cp = strrchr (path, '/');
if (cp == NULL)
{ {
warning (_("Expected absolute pathname for libpthread in the" warning (_("Expected absolute pathname for libpthread in the"
" inferior, but got %s."), path); " inferior, but got %s."), obj->name);
return 0; return 0;
} }
else if (cp + 1 + strlen (LIBTHREAD_DB_SO) + 1 > path + sizeof (path))
{ path = xmalloc (strlen (obj->name) + 1 + strlen (LIBTHREAD_DB_SO) + 1);
warning (_("Unexpected: path to libpthread in the inferior is" cleanup = make_cleanup (xfree, path);
" too long: %s"), path);
return 0; strcpy (path, obj->name);
} cp = strrchr (path, '/');
else /* This should at minimum hit the first character. */
{ gdb_assert (cp != NULL);
strcpy (cp + 1, LIBTHREAD_DB_SO); strcpy (cp + 1, LIBTHREAD_DB_SO);
return try_thread_db_load (path); result = try_thread_db_load (path);
}
do_cleanups (cleanup);
return result;
} }
/* Handle $pdir in libthread-db-search-path. /* Handle $pdir in libthread-db-search-path.
@ -888,24 +888,20 @@ try_thread_db_load_from_sdir (void)
static int static int
try_thread_db_load_from_dir (const char *dir, size_t dir_len) try_thread_db_load_from_dir (const char *dir, size_t dir_len)
{ {
char path[PATH_MAX]; struct cleanup *cleanup;
char *path;
int result;
if (dir_len + 1 + strlen (LIBTHREAD_DB_SO) + 1 > sizeof (path)) path = xmalloc (dir_len + 1 + strlen (LIBTHREAD_DB_SO) + 1);
{ cleanup = make_cleanup (xfree, path);
char *cp = xmalloc (dir_len + 1);
memcpy (cp, dir, dir_len);
cp[dir_len] = '\0';
warning (_("libthread-db-search-path component too long,"
" ignored: %s."), cp);
xfree (cp);
return 0;
}
memcpy (path, dir, dir_len); memcpy (path, dir, dir_len);
path[dir_len] = '/'; path[dir_len] = '/';
strcpy (path + dir_len + 1, LIBTHREAD_DB_SO); strcpy (path + dir_len + 1, LIBTHREAD_DB_SO);
return try_thread_db_load (path); result = try_thread_db_load (path);
do_cleanups (cleanup);
return result;
} }
/* Search libthread_db_search_path for libthread_db which "agrees" /* Search libthread_db_search_path for libthread_db which "agrees"