Fix segv when primitive value

Fix #3352
mruby · Dec 25, 2016 · 5c1c002 · 5c1c002
1 parent 000a311
commit 5c1c002
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/kernel.c b/src/kernel.c
@@ -453,9 +453,23 @@ mrb_obj_extend_m(mrb_state *mrb, mrb_value self)
 static mrb_value
 mrb_obj_freeze(mrb_state *mrb, mrb_value self)
 {
-  struct RBasic *b = mrb_basic_ptr(self);
+  struct RBasic *b;
+
+  switch (mrb_type(self)) {
+    case MRB_TT_FALSE:
+    case MRB_TT_TRUE:
+    case MRB_TT_FIXNUM:
+    case MRB_TT_SYMBOL:
+    case MRB_TT_FLOAT:
+      return self;
+    default:
+      break;
+  }
 
-  MRB_SET_FROZEN_FLAG(b);
+  b = mrb_basic_ptr(self);
+  if (!MRB_FROZEN_P(b)) {
+    MRB_SET_FROZEN_FLAG(b);
+  }
   return self;
 }
 

diff --git a/test/t/kernel.rb b/test/t/kernel.rb
@@ -260,6 +260,8 @@ def test_method; end
 assert('Kernel#freeze') do
   obj = Object.new
   assert_equal obj, obj.freeze
+  assert_equal 0, 0.freeze
+  assert_equal :a, :a.freeze
 end
 
 assert('Kernel#global_variables', '15.3.1.3.14') do
@@ -620,4 +622,3 @@ def recurse(count, stop)
 
   assert_equal 6, recurse(0, 5)
 end
-