32fad71f9e
Valgrind reports memory leaking from build_id_to_debug_bfd:
==7261== 88 bytes in 2 blocks are definitely lost in loss record 31,319 of 35,132
==7261== at 0x4A06BCF: malloc (vg_replace_malloc.c:296)
==7261== by 0x32CA88A9B9: strdup (strdup.c:42)
==7261== by 0xFE62AB: lrealpath (lrealpath.c:88)
==7261== by 0x7F7AD6: build_id_to_debug_bfd (build-id.c:116)
==7261== by 0x7F7BB5: find_separate_debug_file_by_buildid (build-id.c:149)
==7261== by 0x6D9382: elf_symfile_read (elfread.c:1348)
==7261== by 0x777F02: read_symbols (symfile.c:875)
==7261== by 0x778505: syms_from_objfile_1 (symfile.c:1078)
==7261== by 0x778548: syms_from_objfile (symfile.c:1094)
==7261== by 0x778746: symbol_file_add_with_addrs (symfile.c:1191)
==7261== by 0x77893B: symbol_file_add_from_bfd (symfile.c:1280)
==7261== by 0x8E51E3: solib_read_symbols (solib.c:706)
==7261== by 0x8E58AF: solib_add (solib.c:1029)
This occurs because commit 1be5090b
in bfd, addressing PR 11983, started
taking a copy of the input filename instead of directly caching it. It
appears that this code was never updated to reflect that API change.
This simple patch creates a cleanup to free the return value for lrealpath.
gdb/ChangeLog
* build-id.c (build_id_to_debug_bfd): Add cleanup to free
return value from lrealpath.
169 lines
4.2 KiB
C
169 lines
4.2 KiB
C
/* build-id-related functions.
|
|
|
|
Copyright (C) 1991-2015 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "bfd.h"
|
|
#include "gdb_bfd.h"
|
|
#include "build-id.h"
|
|
#include "gdb_vecs.h"
|
|
#include "symfile.h"
|
|
#include "objfiles.h"
|
|
#include "filenames.h"
|
|
#include "gdbcore.h"
|
|
|
|
/* See build-id.h. */
|
|
|
|
const struct bfd_build_id *
|
|
build_id_bfd_get (bfd *abfd)
|
|
{
|
|
if (!bfd_check_format (abfd, bfd_object))
|
|
return NULL;
|
|
|
|
if (abfd->build_id != NULL)
|
|
return abfd->build_id;
|
|
|
|
/* No build-id */
|
|
return NULL;
|
|
}
|
|
|
|
/* See build-id.h. */
|
|
|
|
int
|
|
build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
|
|
{
|
|
const struct bfd_build_id *found;
|
|
int retval = 0;
|
|
|
|
found = build_id_bfd_get (abfd);
|
|
|
|
if (found == NULL)
|
|
warning (_("File \"%s\" has no build-id, file skipped"),
|
|
bfd_get_filename (abfd));
|
|
else if (found->size != check_len
|
|
|| memcmp (found->data, check, found->size) != 0)
|
|
warning (_("File \"%s\" has a different build-id, file skipped"),
|
|
bfd_get_filename (abfd));
|
|
else
|
|
retval = 1;
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* See build-id.h. */
|
|
|
|
bfd *
|
|
build_id_to_debug_bfd (size_t build_id_len, const bfd_byte *build_id)
|
|
{
|
|
char *link, *debugdir;
|
|
VEC (char_ptr) *debugdir_vec;
|
|
struct cleanup *back_to;
|
|
int ix;
|
|
bfd *abfd = NULL;
|
|
|
|
/* DEBUG_FILE_DIRECTORY/.build-id/ab/cdef */
|
|
link = alloca (strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1
|
|
+ 2 * build_id_len + (sizeof ".debug" - 1) + 1);
|
|
|
|
/* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
|
|
cause "/.build-id/..." lookups. */
|
|
|
|
debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory);
|
|
back_to = make_cleanup_free_char_ptr_vec (debugdir_vec);
|
|
|
|
for (ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix)
|
|
{
|
|
size_t debugdir_len = strlen (debugdir);
|
|
const gdb_byte *data = build_id;
|
|
size_t size = build_id_len;
|
|
char *s;
|
|
char *filename = NULL;
|
|
struct cleanup *inner;
|
|
|
|
memcpy (link, debugdir, debugdir_len);
|
|
s = &link[debugdir_len];
|
|
s += sprintf (s, "/.build-id/");
|
|
if (size > 0)
|
|
{
|
|
size--;
|
|
s += sprintf (s, "%02x", (unsigned) *data++);
|
|
}
|
|
if (size > 0)
|
|
*s++ = '/';
|
|
while (size-- > 0)
|
|
s += sprintf (s, "%02x", (unsigned) *data++);
|
|
strcpy (s, ".debug");
|
|
|
|
/* lrealpath() is expensive even for the usually non-existent files. */
|
|
if (access (link, F_OK) == 0)
|
|
filename = lrealpath (link);
|
|
|
|
if (filename == NULL)
|
|
continue;
|
|
|
|
/* We expect to be silent on the non-existing files. */
|
|
inner = make_cleanup (xfree, filename);
|
|
abfd = gdb_bfd_open (filename, gnutarget, -1);
|
|
do_cleanups (inner);
|
|
|
|
if (abfd == NULL)
|
|
continue;
|
|
|
|
if (build_id_verify (abfd, build_id_len, build_id))
|
|
break;
|
|
|
|
gdb_bfd_unref (abfd);
|
|
abfd = NULL;
|
|
}
|
|
|
|
do_cleanups (back_to);
|
|
return abfd;
|
|
}
|
|
|
|
/* See build-id.h. */
|
|
|
|
char *
|
|
find_separate_debug_file_by_buildid (struct objfile *objfile)
|
|
{
|
|
const struct bfd_build_id *build_id;
|
|
|
|
build_id = build_id_bfd_get (objfile->obfd);
|
|
if (build_id != NULL)
|
|
{
|
|
bfd *abfd;
|
|
|
|
abfd = build_id_to_debug_bfd (build_id->size, build_id->data);
|
|
/* Prevent looping on a stripped .debug file. */
|
|
if (abfd != NULL
|
|
&& filename_cmp (bfd_get_filename (abfd),
|
|
objfile_name (objfile)) == 0)
|
|
{
|
|
warning (_("\"%s\": separate debug info file has no debug info"),
|
|
bfd_get_filename (abfd));
|
|
gdb_bfd_unref (abfd);
|
|
}
|
|
else if (abfd != NULL)
|
|
{
|
|
char *result = xstrdup (bfd_get_filename (abfd));
|
|
|
|
gdb_bfd_unref (abfd);
|
|
return result;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|