* eval.c (rb_call0): reorganize "return" event post.

* eval.c (return_jump): no need to post "return" event here.

* object.c (str_to_id): raise ArgumentError for NUL containing
  strings.

* parse.y (primary): wrong var node was set for NODE_LAMBDA.
  [ruby-core:04555]

* re.c (make_regexp): need to free internal regexp structure when
  compilation fails.  [ruby-talk:133228]

* parse.y (bv_decl): remove initialize rule from block local
  variable declaration.


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

1 files changed, 3 insertions, 0 deletions

diff --git a/object.c b/object.c
index b95b097b6a..1a81fd7d80 100644
--- a/object.c
+++ b/object.c
@@ -1567,6 +1567,9 @@ str_to_id(str)
     if (!RSTRING(str)->ptr || RSTRING(str)->len == 0) {
 	rb_raise(rb_eArgError, "empty symbol string");
     }
+    if (RSTRING(str)->len != strlen(RSTRING(str)->ptr)) {
+	rb_raise(rb_eArgError, "Symbols should not contain NUL (\\0)");
+    }
     return rb_intern(RSTRING(str)->ptr);
 }