* array.c (rb_ary_become): should not free ptr if it's shared.

* eval.c (rb_alias): prohibit making an alias named "allocate" if
  klass is a metaclass.

* string.c (rb_string_value_ptr): StringValuePtr() should never
  return NULL pointer.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 2 deletions

diff --git a/file.c b/file.c
index 719bb27557..fe13a9ee59 100644
--- a/file.c
+++ b/file.c
@@ -2027,8 +2027,12 @@ rb_stat_become(obj, orig)
     struct stat *nst;
 
     /* need better argument type check */
-    if (!rb_obj_is_kind_of(orig, rb_obj_class(obj))) {
-	rb_raise(rb_eTypeError, "wrong argument type");
+    if (!rb_obj_is_instance_of(orig, rb_obj_class(obj))) {
+	rb_raise(rb_eTypeError, "wrong argument class");
+    }
+    if (DATA_PTR(obj)) {
+	free(DATA_PTR(obj));
+	DATA_PTR(obj) = 0;
     }
     if (DATA_PTR(orig)) {
 	nst = ALLOC(struct stat);