From cab4da70c8577ee7525fb327e7ae79ef9f9e96e5 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 20 Dec 2011 16:50:54 -0800
Subject: rt: Don't check the stack canary on most upcalls

---
 src/rt/rust_task.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/rt/rust_task.cpp')

diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 2e17075ee59..6949df03f43 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -133,6 +133,9 @@ static stk_seg*
 new_stk(rust_scheduler *sched, rust_task *task, size_t requested_sz)
 {
     LOG(task, mem, "creating new stack for task %" PRIxPTR, task);
+    if (task->stk) {
+        check_stack_canary(task->stk);
+    }
 
     // The minimum stack size, in bytes, of a Rust stack, excluding red zone
     size_t min_sz = get_min_stk_size(sched->min_stack_size);
-- 
cgit 1.4.1-3-g733a5