kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 51575,51584: [Backport #11439]

Browse source 
* ext/win32/lib/win32/registry.rb (API#SetValue): add terminator
	  size, not 1 byte.  [ruby-core:70365] [Bug #11439]

	* ext/win32/lib/win32/registry.rb (API#SetValue): data size should
	  be in bytes, not in chars.  [ruby-core:70365] [Bug #11439]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-08-17 14:27:58 +00:00
parent 26eb8e4b4e
commit 911ade36df
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Mon Aug 17 23:27:45 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/win32/lib/win32/registry.rb (API#SetValue): data size should
be in bytes, not in chars. [ruby-core:70365] [Bug #11439]
Mon Aug 17 23:27:45 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/win32/lib/win32/registry.rb (API#SetValue): add terminator
size, not 1 byte. [ruby-core:70365] [Bug #11439]
Mon Aug 17 17:57:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Aug 17 17:57:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_memsearch): should match only char boundaries in wide * re.c (rb_memsearch): should match only char boundaries in wide

2
ext/win32/lib/win32/registry.rb
View file

@ -315,7 +315,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
case type case type
when REG_SZ, REG_EXPAND_SZ, REG_MULTI_SZ when REG_SZ, REG_EXPAND_SZ, REG_MULTI_SZ
data = data.encode(WCHAR) data = data.encode(WCHAR)
size ||= data.size + 1 size ||= data.bytesize + WCHAR_SIZE
end end
check RegSetValueExW.call(hkey, make_wstr(name), 0, type, data, size) check RegSetValueExW.call(hkey, make_wstr(name), 0, type, data, size)
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.7" #define RUBY_VERSION "2.1.7"
#define RUBY_RELEASE_DATE "2015-08-17" #define RUBY_RELEASE_DATE "2015-08-17"
#define RUBY_PATCHLEVEL 398 #define RUBY_PATCHLEVEL 399
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8