Backport #9798

Backport latest version of Psych

Added by Hiroshi SHIBATA over 1 year ago. Updated about 1 year ago.

[ruby-dev:48168]
Status:Closed
Priority:Normal
Assignee:-

Description

Please backport libyaml-0.1.6 fixes in Psych.

ref. r45221, r45453, r45455 and r45577

Associated revisions

Revision 45811
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) r45221: [Backport #9798]

* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
  objects.

* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
  objects.

* test/psych/test_encoding.rb: add test

* ext/psych/lib/psych.rb: add version

Revision 45812
Added by Tomoyuki Chikanaga about 1 year ago

merge revision(s) r45453,r45455,r45577: [Backport #9798]

* ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to
  libyaml-0.1.6 for CVE-2014-2525.

* ext/psych/yaml/config.h: ditto.

* ext/psych/yaml/scanner.c: ditto.

* ext/psych/yaml/yaml_private.h: ditto.

* ext/psych/psych.gemspec: update gemspec for psych-2.0.5

Revision 45870
Added by Usaku NAKAMURA about 1 year ago

merge revision(s) r45453: [Backport #9798]

* ext/psych/yaml/config.h: ditto.

* ext/psych/yaml/scanner.c: ditto.

* ext/psych/yaml/yaml_private.h: ditto.

History

#1 Updated by Tomoyuki Chikanaga about 1 year ago

  • Status changed from Open to Closed
  • % Done changed from 0 to 100

Applied in changeset r45811.


merge revision(s) r45221: [Backport #9798]

* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
  objects.

* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
  objects.

* test/psych/test_encoding.rb: add test

* ext/psych/lib/psych.rb: add version

Also available in: Atom PDF