commit 874d96672c25d1758ebd983f048f94e73742b941
author Colin Cross <ccross@android.com> Fri Jun 30 06:59:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 30 06:59:07 2017 +0000
tree bb32e174c4ade458259ce8d41f7e9b9ea5fb4319
parent ea0c9911c46d67fd37b8ece777a5d6e2a9f2c5e2
parent 7d9edc5a17281eade56acd1ef050aa8605fbbd60

Merge "Fix ScopedSignalHandler" am: 7dbf1a187e am: 1deafe164b
am: 9a29d20486

Change-Id: I0d6f957a8cd0f6feeb2f2ccc89b858bdfa8190cd

libmemunreachable/ScopedSignalHandler.h

diff --git a/libmemunreachable/ScopedSignalHandler.h b/libmemunreachable/ScopedSignalHandler.h
index f62f368..ff53fad 100644
--- a/libmemunreachable/ScopedSignalHandler.h
+++ b/libmemunreachable/ScopedSignalHandler.h
@@ -37,7 +37,7 @@
 
   template <class F>
   void install(int signal, F&& f) {
-    if (signal != -1) MEM_LOG_ALWAYS_FATAL("ScopedSignalHandler already installed");
+    if (signal_ != -1) MEM_LOG_ALWAYS_FATAL("ScopedSignalHandler already installed");
 
     handler_ = SignalFn(std::allocator_arg, allocator_,
                         [=](int signal, siginfo_t* si, void* uctx) { f(*this, signal, si, uctx); });