kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: filesystem: prevent exception raises if path encoding is incorrect. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5173 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-03-20 14:06:49 +00:00
parent 6424155f59
commit e53c8cfc1b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine/scm/adapters/filesystem_adapter.rb
View File

@ -60,7 +60,9 @@ module Redmine
trgt = scm_iconv(@path_encoding, 'UTF-8', trgt_utf8) trgt = scm_iconv(@path_encoding, 'UTF-8', trgt_utf8)
Dir.new(trgt).each do |e1| Dir.new(trgt).each do |e1|
e_utf8 = scm_iconv('UTF-8', @path_encoding, e1) e_utf8 = scm_iconv('UTF-8', @path_encoding, e1)
relative_path_utf8 = format_path_ends((format_path_ends(path,false,true) + e_utf8),false,false) next if e_utf8.blank?
relative_path_utf8 = format_path_ends(
(format_path_ends(path,false,true) + e_utf8),false,false)
t1_utf8 = target(relative_path_utf8) t1_utf8 = target(relative_path_utf8)
t1 = scm_iconv(@path_encoding, 'UTF-8', t1_utf8) t1 = scm_iconv(@path_encoding, 'UTF-8', t1_utf8)
relative_path = scm_iconv(@path_encoding, 'UTF-8', relative_path_utf8) relative_path = scm_iconv(@path_encoding, 'UTF-8', relative_path_utf8)