aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/fiddle/test_pointer.rb6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2810d9e855..710ead265b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 1 19:38:57 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]
+
Fri Jul 1 18:20:00 2016 NARUSE, Yui <naruse@ruby-lang.org>
* .gdbinit (rb_ps_thread): show the detail of cfunc in ruby level
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)