shyouhei	2007-08-22 08:52:26 +0900 (Wed, 22 Aug 2007)

  New Revision: 13146

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/variable.c
    branches/ruby_1_8_6/version.h

  Log:
    * variable.c (rb_path2class): get rid of dangling pointer caused by
      optimized out value.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=13146&r2=13145
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=13146&r2=13145
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/variable.c?r1=13146&r2=13145

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 13145)
+++ ruby_1_8_6/ChangeLog	(revision 13146)
@@ -1,3 +1,8 @@
+Wed Aug 22 08:52:02 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* variable.c (rb_path2class): get rid of dangling pointer caused by
+	  optimized out value.
+
 Wed Aug 22 08:51:20 2007  NAKAMURA Usaku  <usa@r...>
 
 	* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
Index: ruby_1_8_6/variable.c
===================================================================
--- ruby_1_8_6/variable.c	(revision 13145)
+++ ruby_1_8_6/variable.c	(revision 13146)
@@ -241,16 +241,21 @@
     const char *pbeg, *p;
     ID id;
     VALUE c = rb_cObject;
+    VALUE str = 0;
 
     if (path[0] == '#') {
 	rb_raise(rb_eArgError, "can't retrieve anonymous class %s", path);
     }
     pbeg = p = path;
     while (*p) {
-	VALUE str;
-
 	while (*p && *p != ':') p++;
-	str = rb_str_new(pbeg, p-pbeg);
+	if (str) {
+	    RSTRING(str)->len = 0;
+	    rb_str_cat(str, pbeg, p-pbeg);
+	}
+	else {
+	    str = rb_str_new(pbeg, p-pbeg);
+	}
 	id = rb_intern(RSTRING(str)->ptr);
 	if (p[0] == ':') {
 	    if (p[1] != ':') goto undefined_class;
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 13145)
+++ ruby_1_8_6/version.h	(revision 13146)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 47
+#define RUBY_PATCHLEVEL 48
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml