---

brson · brson · commit 78578c0938fb · 2012-04-02T14:23:24.000-07:00
yaml --- r: 15279 b: refs/heads/try c: dd63c5e h: refs/heads/master i: 15277: 60b7652 15275: d2694ed 15271: c4fec66 15263: ee50155 v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fa88d15d636d84b7e6928323386f86d3fec8f51b
+refs/heads/try: dd63c5ef1d55210cf9905295d9c33c622797fb72
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rt/rust_task.h b/branches/try/src/rt/rust_task.h
@@ -463,6 +463,7 @@ inline rust_task* rust_get_current_task() {
 
     // Make sure we've calculated the right address
     ::check_stack_canary(stk);
+    assert(stk->task != NULL && "task pointer not in stack structure");
     return stk->task;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -463,6 +463,7 @@ inline rust_task* rust_get_current_task() {`
`463`	`463`
`464`	`464`	`// Make sure we've calculated the right address`
`465`	`465`	`::check_stack_canary(stk);`
	`466`	`+ assert(stk->task != NULL && "task pointer not in stack structure");`
`466`	`467`	`return stk->task;`
`467`	`468`	`}`
`468`	`469`