Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixing cyclic object reference handling. Thanks to @CvX for the test.…

… fixes #19
  • Loading branch information...
commit 478a7ac57bf802c11ff5d60fd547f5b2530691b4 1 parent 7515920
@tenderlove authored
View
6 CHANGELOG.rdoc
@@ -1,3 +1,9 @@
+Wed Jun 22 03:20:52 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/to_ruby.rb: Fix cyclic references of
+ objects. Thanks to CvX for reporting the bug and a test case.
+ * test/psych/test_object.rb: test for cyclic object references.
+
Thu Jun 9 10:57:03 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: Hash subclasses can be read
View
2  lib/psych/visitors/to_ruby.rb
@@ -182,7 +182,6 @@ def visit_Psych_Nodes_Mapping o
when /^!ruby\/object:?(.*)?$/
name = $1 || 'Object'
obj = revive((resolve_class(name) || Object), o)
- @st[o.anchor] = obj if o.anchor
obj
when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
@@ -233,6 +232,7 @@ def revive_hash hash, o
def revive klass, node
s = klass.allocate
+ @st[node.anchor] = s if node.anchor
h = Hash[*node.children.map { |c| accept c }]
init_with(s, h, node)
end
View
17 test/psych/test_object.rb
@@ -11,6 +11,14 @@ def initialize
end
end
+ class Foo
+ attr_accessor :parent
+
+ def initialize parent
+ @parent = parent
+ end
+ end
+
class TestObject < TestCase
def test_dump_with_tag
tag = Tagged.new
@@ -23,5 +31,14 @@ def test_tag_round_trip
assert_equal tag.baz, tag2.baz
assert_instance_of(Tagged, tag2)
end
+
+ def test_cyclic_references
+ foo = Foo.new(nil)
+ foo.parent = foo
+ loaded = Psych.load Psych.dump foo
+
+ assert_instance_of(Foo, loaded)
+ assert_equal loaded, loaded.parent
+ end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.