Permalink
Browse files

merge revision(s) 22679:

	* class.c (rb_singleton_class_clone): Qnil must be used for a null
	  class reference when we use NIL_P() to check class reference
	  validity.  The bug was exposed by the spec test of Sequel.
	* eval.c (ruby_init): Use NEW_CREF().


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@24843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent b512c1f commit 1636f70ce96c34e7aebc4caa18d177c364311aa3 @shyouhei shyouhei committed Sep 11, 2009
Showing with 14 additions and 6 deletions.
  1. +8 −0 ChangeLog
  2. +1 −1 class.c
  3. +1 −1 eval.c
  4. +4 −4 version.h
View
@@ -1,3 +1,11 @@
+Fri Sep 11 11:56:53 2009 Akinori MUSHA <knu@iDaemons.org>
+
+ * class.c (rb_singleton_class_clone): Qnil must be used for a null
+ class reference when we use NIL_P() to check class reference
+ validity. The bug was exposed by the spec test of Sequel.
+
+ * eval.c (ruby_init): Use NEW_CREF().
+
Thu Sep 10 10:53:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (rb_sysopen): workaround for MSVCRT's bug.
View
@@ -153,7 +153,7 @@ rb_singleton_class_clone(obj)
data.klass = obj;
break;
default:
- data.klass = 0;
+ data.klass = Qnil;
break;
}
View
@@ -1410,7 +1410,7 @@ ruby_init()
rb_call_inits();
ruby_class = rb_cObject;
ruby_frame->self = ruby_top_self;
- ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
+ ruby_top_cref = NEW_CREF(rb_cObject, 0);
ruby_cref = ruby_top_cref;
rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
#ifdef __MACOS__
View
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-09-10"
+#define RUBY_RELEASE_DATE "2009-09-11"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090910
-#define RUBY_PATCHLEVEL 201
+#define RUBY_RELEASE_CODE 20090911
+#define RUBY_PATCHLEVEL 202
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

0 comments on commit 1636f70

Please sign in to comment.