---

yaml
---
r: 14613
b: refs/heads/try
c: 38b2b74
h: refs/heads/master
i:
  14611: e942fa6
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 6b0c4822c10d1e0824043f81fc9e39096cc40172
+refs/heads/try: 38b2b74413da1d982df82fbb9552373b7dc52e69
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/memory_region.cpp

@@ -204,14 +204,8 @@ memory_region::claim_alloc(void *mem) {
 
 void
 memory_region::maybe_poison(void *mem) {
-    // TODO: We should lock this, in case the compiler doesn't.
-    static int poison = -1;
-    if (poison < 0) {
-        char *env_str = getenv("RUST_POISON_ON_FREE");
-        poison = env_str != NULL && env_str[0] != '\0';
-    }
 
-    if (!poison)
+    if (!_srv->env->poison_on_free)
         return;
 
 #   if RUSTRT_TRACK_ALLOCATIONS >= 1

branches/try/src/rt/rust_env.cpp

@@ -13,6 +13,7 @@
 #define CHECK_CLAIMS "CHECK_CLAIMS"
 #define DETAILED_LEAKS "DETAILED_LEAKS"
 #define RUST_SEED "RUST_SEED"
+#define RUST_POISON_ON_FREE "RUST_POISON_ON_FREE"
 
 #if defined(__WIN32__)
 static int
@@ -116,6 +117,7 @@ load_env() {
     env->check_claims = getenv(CHECK_CLAIMS) != NULL;
     env->detailed_leaks = getenv(DETAILED_LEAKS) != NULL;
     env->rust_seed = copyenv(RUST_SEED);
+    env->poison_on_free = getenv(RUST_POISON_ON_FREE) != NULL;
 
     return env;
 }

branches/try/src/rt/rust_env.h

@@ -6,6 +6,7 @@ struct rust_env {
     bool check_claims;
     bool detailed_leaks;
     char* rust_seed;
+    bool poison_on_free;
 };
 
 rust_env* load_env();