diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/linux-thread-db.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 89298e88b37..c2eb3bb8bdb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2013-05-30 Tom Tromey <tromey@redhat.com> + * linux-thread-db.c (thread_db_load_search): Unconditionally + call do_cleanups. + +2013-05-30 Tom Tromey <tromey@redhat.com> + * solib-aix.c (solib_aix_bfd_open): Don't use a null cleanup for 'cleanup'; instead use a later one. diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c index a698c659fc9..23c29c9dd1d 100644 --- a/gdb/linux-thread-db.c +++ b/gdb/linux-thread-db.c @@ -1029,17 +1029,17 @@ thread_db_load_search (void) || this_dir[pdir_len] == '/')) { char *subdir = NULL; - struct cleanup *free_subdir_cleanup = NULL; + struct cleanup *free_subdir_cleanup + = make_cleanup (null_cleanup, NULL); if (this_dir[pdir_len] == '/') { subdir = xmalloc (strlen (this_dir)); - free_subdir_cleanup = make_cleanup (xfree, subdir); + make_cleanup (xfree, subdir); strcpy (subdir, this_dir + pdir_len + 1); } rc = try_thread_db_load_from_pdir (subdir); - if (free_subdir_cleanup != NULL) - do_cleanups (free_subdir_cleanup); + do_cleanups (free_subdir_cleanup); if (rc) break; } |