diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-09 21:38:29 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-09 21:38:29 +0900 |
| commit | b45e99b0d5e6b1efb6aa6f38e9ab24ed93590fe2 (patch) | |
| tree | 55400ea5b679102add823d6ac3fccde8dfb1a94e /src/class.c | |
| parent | ef9daf7ef37a4ad9469a260ea52aa014bdf6549e (diff) | |
| download | mruby-b45e99b0d5e6b1efb6aa6f38e9ab24ed93590fe2.tar.gz mruby-b45e99b0d5e6b1efb6aa6f38e9ab24ed93590fe2.zip | |
call kh_get before kh_put to avoid potential key lost; reported by @mirichi
Diffstat (limited to 'src/class.c')
| -rw-r--r-- | src/class.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/class.c b/src/class.c index 656120845..4c39aed9a 100644 --- a/src/class.c +++ b/src/class.c @@ -313,7 +313,10 @@ mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, struct RPro khiter_t k; if (!h) h = c->mt = kh_init(mt, mrb); - k = kh_put(mt, mrb, h, mid); + k = kh_get(mt, mrb, h, mid); + if (k == kh_end(h)) { + k = kh_put(mt, mrb, h, mid); + } kh_value(h, k) = p; if (p) { mrb_field_write_barrier(mrb, (struct RBasic *)c, (struct RBasic *)p); @@ -346,7 +349,10 @@ mrb_define_method_vm(mrb_state *mrb, struct RClass *c, mrb_sym name, mrb_value b struct RProc *p; if (!h) h = c->mt = kh_init(mt, mrb); - k = kh_put(mt, mrb, h, name); + k = kh_get(mt, mrb, h, name); + if (k == kh_end(h)) { + k = kh_put(mt, mrb, h, name); + } p = mrb_proc_ptr(body); kh_value(h, k) = p; if (p) { |