maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Do not assert on POSIXDYLD double-eAdd. 

Summary:
This has been discovered while experimenting with the gecko linker on android.
In general, assert()'ing on "user input" is a bad idea.

Test Plan: Run unit tests.

Reviewers: clayborg, tfiala

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D8495

llvm-svn: 232966
This commit is contained in:
Stephane Sezer 2015-03-23 17:05:41 +00:00
parent d2a1559846
commit acd80d80dd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
View File

@ -206,7 +206,12 @@ DYLDRendezvous::UpdateSOEntries()
// state and take a snapshot of the currently loaded images. // state and take a snapshot of the currently loaded images.
if (m_current.state == eAdd || m_current.state == eDelete) if (m_current.state == eAdd || m_current.state == eDelete)
{ {
assert(m_previous.state == eConsistent || (m_previous.state == eAdd && m_current.state == eDelete)); // Some versions of the android dynamic linker might send two
// notifications with state == eAdd back to back. Ignore them
// until we get an eConsistent notification.
if (!(m_previous.state == eConsistent || (m_previous.state == eAdd && m_current.state == eDelete)))
return false;
m_soentries.clear(); m_soentries.clear();
m_added_soentries.clear(); m_added_soentries.clear();
m_removed_soentries.clear(); m_removed_soentries.clear();