ruby-changes:14633
From: yugui <ko1@a...>
Date: Sat, 30 Jan 2010 21:45:56 +0900 (JST)
Subject: [ruby-changes:14633] Ruby:r26478 (ruby_1_9_1): merges r25290 from trunk into ruby_1_9_1.
yugui 2010-01-30 21:45:40 +0900 (Sat, 30 Jan 2010) New Revision: 26478 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26478 Log: merges r25290 from trunk into ruby_1_9_1. -- * file.c (path_check_0): prevent from GC. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/file.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 26477) +++ ruby_1_9_1/ChangeLog (revision 26478) @@ -1,3 +1,7 @@ +Sat Oct 10 23:57:44 2009 Nobuyoshi Nakada <nobu@r...> + + * file.c (path_check_0): prevent from GC. + Fri Oct 9 02:12:02 2009 Marc-Andre Lafortune <ruby-core@m...> * ext/curses/curses.c: Many functions of module Curses could cause a Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 26477) +++ ruby_1_9_1/version.h (revision 26478) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 383 +#define RUBY_PATCHLEVEL 384 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_1/file.c =================================================================== --- ruby_1_9_1/file.c (revision 26477) +++ ruby_1_9_1/file.c (revision 26478) @@ -4405,7 +4405,8 @@ rb_str_cat2(newpath, "/"); rb_str_cat2(newpath, p0); - p0 = RSTRING_PTR(path = newpath); + path = newpath; + p0 = RSTRING_PTR(newpath); } for (;;) { #ifndef S_IWOTH @@ -4419,6 +4420,7 @@ rb_warn("Insecure world writable dir %s in %sPATH, mode 0%o", p0, (execpath ? "" : "LOAD_"), st.st_mode); if (p) *p = '/'; + RB_GC_GUARD(path); return 0; } s = strrdirsep(p0); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/