---

yaml
---
r: 3429
b: refs/heads/master
c: 2f84987
h: refs/heads/master
i:
  3427: 28bd6a1
v: v3

Author: Eric Holk

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49a8cb34d2b6e3f7af4a7cbe842fe48ffa0245eb
+refs/heads/master: 2f84987a48c3625670cd62321f0e3dcb5c0e8768

trunk/src/rt/rust.cpp

@@ -24,15 +24,15 @@ command_line_args : public kernel_owned<command_line_args>
         LPCWSTR cmdline = GetCommandLineW();
         LPWSTR *wargv = CommandLineToArgvW(cmdline, &argc);
         task->dom->win32_require("CommandLineToArgvW", wargv != NULL);
-        argv = (char **) dom->malloc(sizeof(char*) * argc);
+        argv = (char **) kernel->malloc(sizeof(char*) * argc);
         for (int i = 0; i < argc; ++i) {
             int n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1,
                                               NULL, 0, NULL, NULL);
-            dom->win32_require("WideCharToMultiByte(0)", n_chars != 0);
-            argv[i] = (char *) dom->malloc(n_chars);
+            task->dom->win32_require("WideCharToMultiByte(0)", n_chars != 0);
+            argv[i] = (char *) kernel->malloc(n_chars);
             n_chars = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1,
                                           argv[i], n_chars, NULL, NULL);
-            dom->win32_require("WideCharToMultiByte(1)", n_chars != 0);
+            task->dom->win32_require("WideCharToMultiByte(1)", n_chars != 0);
         }
         LocalFree(wargv);
 #endif
@@ -66,9 +66,9 @@ command_line_args : public kernel_owned<command_line_args>
 
 #ifdef __WIN32__
         for (int i = 0; i < argc; ++i) {
-            task->free(argv[i]);
+            kernel->free(argv[i]);
         }
-        task->free(argv);
+        kernel->free(argv);
 #endif
     }
 };

trunk/src/rt/rust_task.cpp

@@ -57,7 +57,7 @@ rust_task::rust_task(rust_dom *dom, rust_task_list *state,
     maybe_proxy<rust_task>(this),
     stk(NULL),
     runtime_sp(0),
-    rust_sp(NULL),
+    rust_sp(0),
     gc_alloc_chain(0),
     dom(dom),
     cache(NULL),