prevent segfault when null string used as hash key

MoarVM · Nov 11, 2016 · 2817993 · 2817993
1 parent 4c9fd00
commit 2817993
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/6model/reprs/MVMHash.c b/src/6model/reprs/MVMHash.c
@@ -18,7 +18,7 @@ static MVMObject * type_object_for(MVMThreadContext *tc, MVMObject *HOW) {
 }
 
 MVM_STATIC_INLINE void extract_key(MVMThreadContext *tc, void **kdata, size_t *klen, MVMObject *key) {
-    MVM_HASH_EXTRACT_KEY(tc, kdata, klen, key, "MVMHash representation requires MVMString keys")
+    MVM_HASH_EXTRACT_KEY(tc, kdata, klen, key, "MVMHash representation requires defined MVMString keys")
 }
 
 /* Copies the body of one object to another. */

diff --git a/src/6model/reprs/MVMHash.h b/src/6model/reprs/MVMHash.h
@@ -46,7 +46,7 @@ const MVMREPROps * MVMHash_initialize(MVMThreadContext *tc);
     MVM_HASH_ACTION_SELECT_CACHE(tc, hash, name, entry, HASH_FIND_CACHE)
 
 #define MVM_HASH_EXTRACT_KEY(tc, kdata, klen, key, error) \
-if (REPR(key)->ID == MVM_REPR_ID_MVMString && IS_CONCRETE(key)) { \
+if (!MVM_is_null(tc, (MVMObject *)key) && REPR(key)->ID == MVM_REPR_ID_MVMString && IS_CONCRETE(key)) { \
     MVM_string_flatten(tc, (MVMString *)key); \
     *kdata = ((MVMString *)key)->body.storage.blob_32; \
     *klen  = ((MVMString *)key)->body.num_graphs * sizeof(MVMGrapheme32); \