Browse Source

Merge pull request #1962 from SoDa-GitHub/master

修复ConfigForm不安全代码。链接分隔符支持空格。
tags/4.1.1
Allen Zhu GitHub 6 years ago
parent
commit
b5e32bdd50
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
  1. +4
    -4
      shadowsocks-csharp/Data/zh_CN.txt
  2. +1
    -1
      shadowsocks-csharp/Model/Server.cs
  3. +1
    -1
      shadowsocks-csharp/View/ConfigForm.cs

+ 4
- 4
shadowsocks-csharp/Data/zh_CN.txt View File

@@ -107,8 +107,8 @@ Switch share over LAN=切换局域网共享
Show Logs=显示日志 Show Logs=显示日志
Switch to prev server=切换上个服务器 Switch to prev server=切换上个服务器
Switch to next server=切换下个服务器 Switch to next server=切换下个服务器
Reg All=注册全部
Reg Hotkeys At Startup=启动时注册
Reg All=注册全部快捷
Reg Hotkeys At Startup=启动时注册快捷
# Messages # Messages
@@ -145,6 +145,6 @@ Unsupported operating system, use Windows Vista at least.=不支持的操作系
Unsupported .NET Framework, please update to 4.6.2 or later.=当前 .NET Framework 版本过低,请升级至4.6.2或更新版本。 Unsupported .NET Framework, please update to 4.6.2 or later.=当前 .NET Framework 版本过低,请升级至4.6.2或更新版本。
Proxy request failed=代理请求失败 Proxy request failed=代理请求失败
Proxy handshake failed=代理握手失败 Proxy handshake failed=代理握手失败
Register hotkey failed=注册键失败
Cannot parse hotkey: {0}=解析键失败: {0}
Register hotkey failed=注册快捷键失败
Cannot parse hotkey: {0}=解析快捷键失败: {0}
Timeout is invalid, it should not exceed {0}=超时无效,不应超过 {0} Timeout is invalid, it should not exceed {0}=超时无效,不应超过 {0}

+ 1
- 1
shadowsocks-csharp/Model/Server.cs View File

@@ -113,7 +113,7 @@ namespace Shadowsocks.Model
public static List<Server> GetServers(string ssURL) public static List<Server> GetServers(string ssURL)
{ {
var serverUrls = ssURL.Split('\r', '\n');
var serverUrls = ssURL.Split('\r', '\n', ' ');
List<Server> servers = new List<Server>(); List<Server> servers = new List<Server>();
foreach (string serverUrl in serverUrls) foreach (string serverUrl in serverUrls)


+ 1
- 1
shadowsocks-csharp/View/ConfigForm.cs View File

@@ -228,7 +228,7 @@ namespace Shadowsocks.View
ServersListBox.SelectedIndex = _lastSelectedIndex; ServersListBox.SelectedIndex = _lastSelectedIndex;
return; return;
} }
if (_lastSelectedIndex >= 0)
if (_lastSelectedIndex >= 0 && _lastSelectedIndex < _modifiedConfiguration.configs.Count)
{ {
ServersListBox.Items[_lastSelectedIndex] = _modifiedConfiguration.configs[_lastSelectedIndex].FriendlyName(); ServersListBox.Items[_lastSelectedIndex] = _modifiedConfiguration.configs[_lastSelectedIndex].FriendlyName();
} }


Loading…
Cancel
Save