* array.c (rb_ary_delete): element comparison might change array

  size. [ruby-dev:24273]

* parse.y: make ruby parser reentrant. merge ripper parser to the
  real one.  this change makes ruby require bison.

* file.c (rb_file_truncate): clear stdio buffer before truncating
  the file.  [ruby-dev:24191]

* ext/digest/digest.c: use rb_obj_class() instead of CLASS_OF
  which might return singleton class.  [ruby-dev:24202]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 2 deletions

diff --git a/string.c b/string.c
index 3ebf76e74..5814836a7 100644
--- a/string.c
+++ b/string.c
@@ -4352,9 +4352,10 @@ rb_str_crypt(str, salt)
  */
 
 VALUE
-rb_str_intern(str)
-    VALUE str;
+rb_str_intern(s)
+    VALUE s;
 {
+    volatile VALUE str = s;
     ID id;
 
     if (!RSTRING(str)->ptr || RSTRING(str)->len == 0) {