commit 7d9edc5a17281eade56acd1ef050aa8605fbbd60
author Colin Cross <ccross@android.com> Fri Jun 30 06:54:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 30 06:54:38 2017 +0000
tree 06249d181298f32f56539cd7bae80f266f7325a2
parent 013af00ccb0d3a18c434ec2bb91edaa8adc6e3d2
parent 11007b90c8ed9150dc8cfb21dbb6d6cf5a11a305

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

Change-Id: Ie40e77a28100eddb12a85cc8bcd31f169f317805

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); });