* 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, 2 insertions, 1 deletions

diff --git a/ruby.h b/ruby.h
index 3b74185f53..7829b85476 100644
--- a/ruby.h
+++ b/ruby.h
@@ -211,6 +211,7 @@ void rb_check_type _((VALUE,int));
 
 VALUE rb_str_to_str _((VALUE));
 VALUE rb_string_value _((volatile VALUE*));
+char *rb_string_value_ptr _((volatile VALUE*));
 
 #define StringValue(v) if (TYPE(v) != T_STRING) rb_string_value(&(v))
 void rb_check_safe_str _((VALUE));
@@ -218,7 +219,7 @@ void rb_check_safe_str _((VALUE));
     StringValue(v);\
     rb_check_safe_str(v);\
 } while (0)
-#define StringValuePtr(v) RSTRING((TYPE(v) == T_STRING) ? (v) : rb_string_value(&(v)))->ptr
+#define StringValuePtr(v) rb_string_value_ptr(&(v))
 /* obsolete macro - use SafeStringValue(v) */
 #define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))