commit 118b198af693c097a172d9387cc05075f2f0c632
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 01 22:58:22 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 01 22:58:24 2017 +0000
tree 2d2683664e4935b93a6cdbd0d0d626eff6aca345
parent 3c838bbb4aca12936aa3d8e96f3b04af3803d0f4
parent 68e6c03081688635c4e0d75b7c4c5afd37ae04f2

Merge "Check overflows in c-tor instead of doing it in d-tor"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 79c3ac5..b8dd216 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -462,13 +462,13 @@
   if (ref_count_++ == 0) {
     protect_data(PROT_READ | PROT_WRITE);
   }
-}
 
-ProtectedDataGuard::~ProtectedDataGuard() {
   if (ref_count_ == 0) { // overflow
     __libc_fatal("Too many nested calls to dlopen()");
   }
+}
 
+ProtectedDataGuard::~ProtectedDataGuard() {
   if (--ref_count_ == 0) {
     protect_data(PROT_READ);
   }