From e53c8cfc1baa299f9c1e2dab1c7b4a764115c010 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 20 Mar 2011 14:06:49 +0000 Subject: [PATCH] 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 --- lib/redmine/scm/adapters/filesystem_adapter.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/redmine/scm/adapters/filesystem_adapter.rb b/lib/redmine/scm/adapters/filesystem_adapter.rb index 3f3f131e2..77977d885 100644 --- a/lib/redmine/scm/adapters/filesystem_adapter.rb +++ b/lib/redmine/scm/adapters/filesystem_adapter.rb @@ -60,7 +60,9 @@ module Redmine trgt = scm_iconv(@path_encoding, 'UTF-8', trgt_utf8) Dir.new(trgt).each do |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 = scm_iconv(@path_encoding, 'UTF-8', t1_utf8) relative_path = scm_iconv(@path_encoding, 'UTF-8', relative_path_utf8) -- 2.39.5