summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-17 01:38:16 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-17 01:38:16 +0000
commit07636686da3b93120a1f56e79bdf5ab9ad1f6f8d (patch)
treeae995cae421aa8bfeca253aa1e3f93749599b61e
parent1f86c08fdf8a4280eb321ad8732bc85f46f4ee6f (diff)
* ext/psych/lib/psych.rb (load_file): make sure opened yaml files are
also closed. [ruby-core:41088] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/psych/lib/psych.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 81ac159405..30e79400a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 17 10:36:46 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych.rb (load_file): make sure opened yaml files are
+ also closed. [ruby-core:41088]
+
Wed Nov 16 18:13:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (LIBRUBY_A): check if generated linked library is
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index d1dc0f0af7..497f5952a3 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -229,7 +229,7 @@ module Psych
# Load the document contained in +filename+. Returns the yaml contained in
# +filename+ as a ruby object
def self.load_file filename
- self.load File.open(filename)
+ File.open(filename) { |f| self.load f }
end
# :stopdoc: