summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 05:39:39 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 05:39:39 +0000
commit8836e7101258fd2a9b56bed2a69b2a0b3b39b015 (patch)
treea62a3794c61d11efe1e3c28d1fe82358ddee59aa
parent967618d610d8bfb2169833c5c79578a00ea46b18 (diff)
downloadruby-8836e7101258fd2a9b56bed2a69b2a0b3b39b015.tar.gz
ruby-8836e7101258fd2a9b56bed2a69b2a0b3b39b015.tar.xz
ruby-8836e7101258fd2a9b56bed2a69b2a0b3b39b015.zip
* 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/trunk@19513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/tmpdir.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7832ce273..e099c4913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 24 14:38:29 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
+ fixed [ruby-dev:36493]
+
Wed Sep 24 11:18:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_s_binread): offset argument was wrongly passed to
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 2e82aa528..bcd66ab42 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