---

yaml
---
r: 14187
b: refs/heads/try
c: dd0ae80
h: refs/heads/master
i:
  14185: adef3ec
  14183: 959631f
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: fc028c30a0570e097f4f16f9731c1433226e5367
+refs/heads/try: dd0ae80e63beed52164eac76bc94b36b73b6c590
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_stack.h

@@ -13,13 +13,19 @@ struct stk_seg {
     uint8_t data[];
 };
 
+// A value that goes at the end of the stack and must not be touched
+const uint8_t stack_canary[] = {0xAB, 0xCD, 0xAB, 0xCD,
+                                0xAB, 0xCD, 0xAB, 0xCD,
+                                0xAB, 0xCD, 0xAB, 0xCD,
+                                0xAB, 0xCD, 0xAB, 0xCD};
+
 void
 add_stack_canary(stk_seg *stk);
 
 template <class T>
 stk_seg *
 create_stack(T allocer, size_t sz) {
-  size_t total_sz = sizeof(stk_seg) + sz;
+  size_t total_sz = sizeof(stk_seg) + sz + sizeof(stack_canary);
   stk_seg *stk = (stk_seg *)allocer->malloc(total_sz, "stack");
   memset(stk, 0, sizeof(stk_seg));
   add_stack_canary(stk);