redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #938 from ahorek/fd_leaks

Browse Source 
file descriptor leaks
This commit is contained in:
Karel Picman 2019-01-03 10:00:42 +01:00 committed by GitHub
commit c883fdd8f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/dmsf_controller.rb
View File

@ -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

14
app/views/settings/_dmsf_settings.html.erb
View File

@ -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 %>