darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix potential crashes when Target::make_symbol() returns NULL.

Browse source 
2016-08-10  James Clarke  <jrtc27@jrtc27.com>

gold/
	PR gold/20443
	* symtab.cc (Symbol_table::add_from_relobj): Handle NULL symbols,
	which will be present for STT_SPARC_REGISTER.
	(Symbol_table::add_from_pluginobj): Likewise.
	(Symbol_table::add_from_dynobj): Likewise.
	(Symbol_table::add_from_incrobj): Removed dead code.
This commit is contained in:
James Clarke 2016-08-10 09:58:01 -07:00 committed by Cary Coutant
parent 007801eeb1
commit 2c00092dce
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gold/ChangeLog
View file

@ -1,3 +1,12 @@
2016-08-10 James Clarke <jrtc27@jrtc27.com>
PR gold/20443
* symtab.cc (Symbol_table::add_from_relobj): Handle NULL symbols,
which will be present for STT_SPARC_REGISTER.
(Symbol_table::add_from_pluginobj): Likewise.
(Symbol_table::add_from_dynobj): Likewise.
(Symbol_table::add_from_incrobj): Removed dead code.
2016-08-10 James Clarke <jrtc27@jrtc27.com>
PR gold/20442

13
gold/symtab.cc
View file

@ -1325,6 +1325,9 @@ Symbol_table::add_from_relobj(
res = this->add_from_object(relobj, name, name_key, ver, ver_key,
is_default_version, *psym, st_shndx,
is_ordinary, orig_st_shndx);
if (res == NULL)
continue;
if (is_forced_local)
this->force_local(res);
@ -1406,6 +1409,9 @@ Symbol_table::add_from_pluginobj(
is_default_version, *sym, st_shndx,
is_ordinary, st_shndx);
if (res == NULL)
return NULL;
if (is_forced_local)
this->force_local(res);
@ -1602,6 +1608,9 @@ Symbol_table::add_from_dynobj(
}
}
if (res == NULL)
continue;
// Note that it is possible that RES was overridden by an
// earlier object, in which case it can't be aliased here.
if (st_shndx != elfcpp::SHN_UNDEF
@ -1640,7 +1649,6 @@ Symbol_table::add_from_incrobj(
Stringpool::Key ver_key = 0;
bool is_default_version = false;
bool is_forced_local = false;
Stringpool::Key name_key;
name = this->namepool_.add(name, true, &name_key);
@ -1650,9 +1658,6 @@ Symbol_table::add_from_incrobj(
is_default_version, *sym, st_shndx,
is_ordinary, st_shndx);
if (is_forced_local)
this->force_local(res);
return res;
}