From 729c3d78b3f54a11641a52b63a624c336914b8cd Mon Sep 17 00:00:00 2001
From: pavel <pavel.rosicky@easy.cz>
Date: Wed, 2 Jan 2019 23:03:36 +0100
Subject: [PATCH] file descriptor leaks

---
 app/controllers/dmsf_controller.rb         |  7 ++++---
 app/views/settings/_dmsf_settings.html.erb | 14 +++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 73182275..bf7c59f0 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -378,9 +378,10 @@ class DmsfController < ApplicationController
     zipped_content = DmsfHelper.temp_dir.join(DmsfHelper.temp_filename('dmsf_email_sent_documents.zip'))
 
     File.open(zipped_content, 'wb') do |f|
-      zip_file = File.open(zip.finish, 'rb')
-      while (buffer = zip_file.read(8192))
-        f.write(buffer)
+      File.open(zip.finish, 'rb') do |zip_file|
+        while (buffer = zip_file.read(8192))
+          f.write(buffer)
+        end
       end
     end
 
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index 2e5aaa5c..501c8750 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -78,11 +78,11 @@
 <% end %>
 <% testfilename = DmsfFile.storage_path.join('test.test') %>
 <% if File.exist?(storage_dir) %>
-  <%	begin %>
-    <% File.open(testfilename, 'wb') %>
+  <% begin %>
+    <% File.open(testfilename, 'wb') {} %>
   <% rescue %>
     <p class="warning"><%= l(:error_file_can_not_be_created) %></p>
-  <%	ensure %>
+  <% ensure %>
     <% FileUtils.rm_f(testfilename) %>
   <% end %>
 <% end %>
@@ -108,12 +108,12 @@
 <% path = Pathname.new(tmpdir) %>
 <% testfilename = path.join('test.test') %>
 <% if File.exist?(tmpdir) %>
-  <%	begin %>
-    <% File.open(testfilename, 'wb') %>
+  <% begin %>
+    <% File.open(testfilename, 'wb') {} %>
   <% rescue %>
     <p class="warning"><%= l(:error_tmpfile_can_not_be_created) %></p>
-  <%	ensure %>
-    <% File.delete(testfilename) if File.exist?(testfilename) %>
+  <% ensure %>
+    <% FileUtils.rm_f(testfilename) %>
   <% end %>
 <% end %>