| commit | 3ae69aab0eabc635f0801fa157cce3a04b6ed08d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 13 20:55:20 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 13 20:55:20 2016 +0000 |
| tree | fe969282de6f716637055f5d5cd9c162205dbd81 | |
| parent | 868b6fa4261a1d09e016cab6f43dada0273694b8 [diff] | |
| parent | dd906d7da0595902bbf1b381c84fd9a8a4816973 [diff] |
Merge "linker: unload RTLD_NODELETE libraries when loading fails"
diff --git a/linker/linker.cpp b/linker/linker.cpp index 855b32b..bda713e 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp
@@ -3220,7 +3220,7 @@ } bool soinfo::can_unload() const { - return (get_rtld_flags() & (RTLD_NODELETE | RTLD_GLOBAL)) == 0; + return !is_linked() || ((get_rtld_flags() & (RTLD_NODELETE | RTLD_GLOBAL)) == 0); } bool soinfo::is_linked() const {