Skip to content

Commit c08beb3

Browse files
committed
---
yaml --- r: 142697 b: refs/heads/try2 c: 2c13157 h: refs/heads/master i: 142695: 3f97cbd v: v3
1 parent 6023902 commit c08beb3

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 07e52eb7fc75466d294a1fd9d614f5e0276ab834
8+
refs/heads/try2: 2c1315719da842b8d5fcd5e59faf58f2bb408765
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/rt/rust_builtin.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,10 @@ rand_gen_seed(uint8_t* dest, size_t size) {
8686

8787
extern "C" CDECL void *
8888
rand_new_seeded(uint8_t* seed, size_t seed_size) {
89-
rust_task *task = rust_get_current_task();
90-
rust_rng *rng = (rust_rng *) task->malloc(sizeof(rust_rng),
91-
"rand_new_seeded");
92-
if (!rng) {
93-
task->fail();
94-
return NULL;
95-
}
96-
char *env_seed = task->kernel->env->rust_seed;
97-
rng_init(rng, env_seed, seed, seed_size);
89+
assert(seed != NULL);
90+
rust_rng *rng = (rust_rng *) malloc(sizeof(rust_rng));
91+
assert(rng != NULL && "rng alloc failed");
92+
rng_init(rng, NULL, seed, seed_size);
9893
return rng;
9994
}
10095

@@ -105,8 +100,7 @@ rand_next(rust_rng *rng) {
105100

106101
extern "C" CDECL void
107102
rand_free(rust_rng *rng) {
108-
rust_task *task = rust_get_current_task();
109-
task->free(rng);
103+
free(rng);
110104
}
111105

112106

0 commit comments

Comments
 (0)