2.41 Release sources

This commit is contained in:
Nick Clifton
2023-08-02 09:23:36 +01:00
parent 69c37f53e2
commit 675b9d612c
288 changed files with 159267 additions and 20912 deletions

View File

@@ -3054,7 +3054,7 @@ Sized_relobj_file<size, big_endian>::find_kept_section_object(
// Return the name of symbol SYMNDX.
template<int size, bool big_endian>
std::string
const char*
Sized_relobj_file<size, big_endian>::get_symbol_name(unsigned int symndx)
{
if (this->symtab_shndx_ == 0)
@@ -3065,24 +3065,6 @@ Sized_relobj_file<size, big_endian>::get_symbol_name(unsigned int symndx)
&symbols_size,
false);
const unsigned char* p = symbols + symndx * This::sym_size;
if (p >= symbols + symbols_size)
return NULL;
elfcpp::Sym<size, big_endian> sym(p);
if (sym.get_st_name() == 0 && sym.get_st_type() == elfcpp::STT_SECTION)
{
bool is_ordinary;
unsigned int sym_shndx = this->adjust_sym_shndx(symndx,
sym.get_st_shndx(),
&is_ordinary);
if (!is_ordinary || sym_shndx >= this->shnum())
return NULL;
return this->section_name(sym_shndx);
}
unsigned int symbol_names_shndx =
this->adjust_shndx(this->section_link(this->symtab_shndx_));
section_size_type names_size;
@@ -3090,25 +3072,14 @@ Sized_relobj_file<size, big_endian>::get_symbol_name(unsigned int symndx)
this->section_contents(symbol_names_shndx, &names_size, false);
const char* symbol_names = reinterpret_cast<const char*>(symbol_names_u);
unsigned int sym_name = sym.get_st_name();
if (sym_name >= names_size)
const unsigned char* p = symbols + symndx * This::sym_size;
if (p >= symbols + symbols_size)
return NULL;
const char* namep = symbol_names + sym_name;
const void* endp = memchr(namep, 0, names_size - sym_name);
if (!endp)
endp = symbol_names + names_size;
std::string name = std::string(namep, static_cast<const char*>(endp) - namep);
if (!parameters->options().do_demangle())
return name;
elfcpp::Sym<size, big_endian> sym(p);
char* demangled_name = cplus_demangle(name.c_str(), DMGL_ANSI | DMGL_PARAMS);
if (!demangled_name)
return name;
name = demangled_name;
free(demangled_name);
return name;
return symbol_names + sym.get_st_name();
}
// Get symbol counts.