diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-22 18:25:19 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-22 18:25:19 +0000 |
commit | 7e58a50983c5c1c294b877a899510bde44949a68 (patch) | |
tree | 378760dd8f160ab07b6e53646a7cd10efc75ee6b | |
parent | 6f122a4f10512bb60795faa0021e498800a7f1b8 (diff) |
merge revision(s) 55554: [Backport #12537]
* test/fiddle/test_pointer.rb (test_to_str, test_to_s, test_aref_aset):
Attempt to use independent strings for destructive tests that
directly modify values on memory by using Fiddle::Pointer.
[Bug #12537] [ruby-dev:49700]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | test/fiddle/test_pointer.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Tue Aug 23 03:22:34 2016 Naohisa Goto <ngotogenome@gmail.com> + + * test/fiddle/test_pointer.rb (test_to_str, test_to_s, test_aref_aset): + Attempt to use independent strings for destructive tests that + directly modify values on memory by using Fiddle::Pointer. + [Bug #12537] [ruby-dev:49700] + Tue Aug 23 03:14:22 2016 Naohisa Goto <ngotogenome@gmail.com> * string.c (str_buf_cat): Fix capa size for embed string. diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb index ec677324eb..aa77c619ef 100644 --- a/test/fiddle/test_pointer.rb +++ b/test/fiddle/test_pointer.rb @@ -35,7 +35,7 @@ module Fiddle end def test_to_str - str = "hello world" + str = Marshal.load(Marshal.dump("hello world")) ptr = Pointer[str] assert_equal 3, ptr.to_str(3).length @@ -46,7 +46,7 @@ module Fiddle end def test_to_s - str = "hello world" + str = Marshal.load(Marshal.dump("hello world")) ptr = Pointer[str] assert_equal 3, ptr.to_s(3).length @@ -202,7 +202,7 @@ module Fiddle assert_equal(str[0].ord, ptr[0]) assert_equal(str[1].ord, ptr[1]) } - str = 'abc' + str = Marshal.load(Marshal.dump('abc')) ptr = Pointer[str] check.call(str, ptr) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.2" #define RUBY_RELEASE_DATE "2016-08-23" -#define RUBY_PATCHLEVEL 175 +#define RUBY_PATCHLEVEL 176 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8 |