summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-26 02:12:10 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-26 02:12:10 +0000
commitfade72eec9ee6fd11245bd097af02adadb3c7639 (patch)
tree44462a9fd4751c6789c1b2f65745862b97fe77fb
parent20178fc002419a3e3673025d1d3637a35e0b4465 (diff)
merge revision(s) 19514:
* lib/tmpdir.rb: setup buffer with nul characters instead of spaces. fixed [ruby-dev:36493] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/tmpdir.rb2
-rw-r--r--version.h8
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 03423334a8..73abb4724a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 26 11:12:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
+ fixed [ruby-dev:36493]
+
Sun Jan 25 00:07:23 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 2e82aa528e..bcd66ab424 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -14,7 +14,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 a954aecc12..12fef70196 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-25"
+#define RUBY_RELEASE_DATE "2009-01-26"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090125
-#define RUBY_PATCHLEVEL 95
+#define RUBY_RELEASE_CODE 20090126
+#define RUBY_PATCHLEVEL 96
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#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[];