diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-09-10 22:58:01 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-09-10 22:58:01 +0900 |
| commit | 543ac88eae2afdf25364720b3b8cac9ce0748fad (patch) | |
| tree | df73da23e9b714131cddd76631e41e91a099495b /src | |
| parent | 1cbbb7e11c02d381a6b76aeebae8db0f54ae9baf (diff) | |
| parent | 8256d77c7fe551011cc744ddb204ca20c4eea175 (diff) | |
| download | mruby-543ac88eae2afdf25364720b3b8cac9ce0748fad.tar.gz mruby-543ac88eae2afdf25364720b3b8cac9ce0748fad.zip | |
Merge pull request #2947 from kazuho/kazuho/freeze-hash-key
freeze the hash keys (fixes #2945)
Diffstat (limited to 'src')
| -rw-r--r-- | src/hash.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/hash.c b/src/hash.c index 0bda2b48b..ffb8bd931 100644 --- a/src/hash.c +++ b/src/hash.c @@ -104,10 +104,11 @@ static void mrb_hash_modify(mrb_state *mrb, mrb_value hash); static inline mrb_value mrb_hash_ht_key(mrb_state *mrb, mrb_value key) { - if (mrb_string_p(key)) - return mrb_str_dup(mrb, key); - else - return key; + if (mrb_string_p(key) && !RSTR_FROZEN_P(mrb_str_ptr(key))) { + key = mrb_str_dup(mrb, key); + RSTR_SET_FROZEN_FLAG(mrb_str_ptr(key)); + } + return key; } #define KEY(key) mrb_hash_ht_key(mrb, key) |