nagachika	2015-08-17 23:02:55 +0900 (Mon, 17 Aug 2015)

  New Revision: 51618

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51618

  Log:
    merge revision(s) 51575,51584: [Backport #11439]
    
    * 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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/win32/lib/win32/registry.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 51617)
+++ ruby_2_2/ChangeLog	(revision 51618)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Aug 17 23:00:56 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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:00:56 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/win32/lib/win32/registry.rb (API#SetValue): add terminator
+	  size, not 1 byte.  [ruby-core:70365] [Bug #11439]
+
 Sun Aug 16 03:14:04 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* re.c (rb_memsearch): should match only char boundaries in wide
Index: ruby_2_2/ext/win32/lib/win32/registry.rb
===================================================================
--- ruby_2_2/ext/win32/lib/win32/registry.rb	(revision 51617)
+++ ruby_2_2/ext/win32/lib/win32/registry.rb	(revision 51618)
@@ -326,7 +326,7 @@ For detail, see the MSDN[http://msdn.mic https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/win32/lib/win32/registry.rb#L326
         case type
         when REG_SZ, REG_EXPAND_SZ, REG_MULTI_SZ
           data = data.encode(WCHAR)
-          size ||= data.size + 1
+          size ||= data.bytesize + WCHAR_SIZE
         end
         check RegSetValueExW.call(hkey, make_wstr(name), 0, type, data, size)
       end
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51617)
+++ ruby_2_2/version.h	(revision 51618)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
-#define RUBY_RELEASE_DATE "2015-08-16"
-#define RUBY_PATCHLEVEL 169
+#define RUBY_RELEASE_DATE "2015-08-17"
+#define RUBY_PATCHLEVEL 170
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51575,51584


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/