From b5ab86fd74a9837cdc9aa79ec4af2d0be1043c00 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 26 Jan 2009 02:11:36 +0000 Subject: merge revision(s) 19514: * lib/tmpdir.rb: setup buffer with nul characters instead of spaces. fixed [ruby-dev:36493] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@21774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/tmpdir.rb | 2 +- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ca843c3e..9caed9de4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 26 11:11:22 2009 NAKAMURA Usaku + + * lib/tmpdir.rb: setup buffer with nul characters instead of spaces. + fixed [ruby-dev:36493] + Sun Jan 25 00:06:48 2009 Yukihiro Matsumoto * lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap): diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index 7f9fd9a54..50b69ba9a 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -12,7 +12,7 @@ class Dir require 'Win32API' CSIDL_LOCAL_APPDATA = 0x001c max_pathlen = 260 - windir = ' '*(max_pathlen+1) + windir = "\0"*(max_pathlen+1) begin getdir = Win32API.new('shell32', 'SHGetFolderPath', 'LLLLP', 'L') raise RuntimeError if getdir.call(0, CSIDL_LOCAL_APPDATA, 0, 0, windir) != 0 diff --git a/version.h b/version.h index 1e0cb825e..dfe9fa56f 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-25" +#define RUBY_RELEASE_DATE "2009-01-26" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090125 -#define RUBY_PATCHLEVEL 309 +#define RUBY_RELEASE_CODE 20090126 +#define RUBY_PATCHLEVEL 310 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit