commit d509c57d4794cde20d76382d19151ca989b6ead5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 19 02:14:19 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 19 02:14:19 2019 +0000
tree 004f17d2459e6635391b0dc913c70deaa581cbce
parent 97657b10c7d93a1b7877ac75c276b70fa4264928
parent 9c672986ae0d03495b9b06e182f24695d3e4ad3f

Merge "Lengthen ScopedDisableMallocTimeout timeout to 10 seconds"

libmemunreachable/ScopedDisableMalloc.h

diff --git a/libmemunreachable/ScopedDisableMalloc.h b/libmemunreachable/ScopedDisableMalloc.h
index 655e826..dc863c9 100644
--- a/libmemunreachable/ScopedDisableMalloc.h
+++ b/libmemunreachable/ScopedDisableMalloc.h
@@ -34,8 +34,8 @@
 
   void Disable() {
     if (!disabled_) {
-      malloc_disable();
       disabled_ = true;
+      malloc_disable();
     }
   }
 
@@ -71,8 +71,7 @@
 
 class ScopedDisableMallocTimeout {
  public:
-  explicit ScopedDisableMallocTimeout(
-      std::chrono::milliseconds timeout = std::chrono::milliseconds(2000))
+  explicit ScopedDisableMallocTimeout(std::chrono::milliseconds timeout = std::chrono::seconds(10))
       : timeout_(timeout), timed_out_(false), disable_malloc_() {
     Disable();
   }