summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-29 10:44:59 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-29 10:44:59 +0000
commit2ad20073074f39f3ee2904a45da310ce4041aa22 (patch)
tree6e986a92398a5553db3b44abb30f108f230f61f7 /lib
parent68ac33a511929268ff5b0e05601b855a3a031b31 (diff)
* lib/csv.rb (CSV.open): Close the opened file when an exception occur.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/csv.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/csv.rb b/lib/csv.rb
index 595586a541..e1199185f9 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1260,7 +1260,12 @@ class CSV
file_opts = {encoding: Encoding.default_external}.merge(file_opts)
retry
end
- csv = new(f, options)
+ begin
+ csv = new(f, options)
+ rescue Exception
+ f.close
+ raise
+ end
# handle blocks like Ruby's open(), not like the CSV library
if block_given?