summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2016-02-05 10:08:28 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2016-02-05 10:08:28 +0900
commit3c73c315f4dff4dbcacdfda75d42fd92d4ba711d (patch)
tree48cd15a59f9b3c26e0e48deb4468812315d91a40 /include
parent25e4ec3f377275c7be49c9fab0b1cac46621085d (diff)
downloadmruby-3c73c315f4dff4dbcacdfda75d42fd92d4ba711d.tar.gz
mruby-3c73c315f4dff4dbcacdfda75d42fd92d4ba711d.zip
Hash: check flags before accessing ifnone; ref #980
Diffstat (limited to 'include')
-rw-r--r--include/mruby/hash.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mruby/hash.h b/include/mruby/hash.h
index 21366c459..faec97152 100644
--- a/include/mruby/hash.h
+++ b/include/mruby/hash.h
@@ -76,7 +76,9 @@ KHASH_DECLARE(ht, mrb_value, mrb_hash_value, TRUE)
#define RHASH_PROCDEFAULT(h) RHASH_IFNONE(h)
MRB_API struct kh_ht * mrb_hash_tbl(mrb_state *mrb, mrb_value hash);
-#define MRB_HASH_PROC_DEFAULT 256
+#define MRB_HASH_DEFAULT 1
+#define MRB_HASH_PROC_DEFAULT 2
+#define MRB_RHASH_DEFAULT_P(h) (RHASH(h)->flags & MRB_HASH_DEFAULT)
#define MRB_RHASH_PROCDEFAULT_P(h) (RHASH(h)->flags & MRB_HASH_PROC_DEFAULT)
/* GC functions */