github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix nil pointer handling in MemoryStreamConfig conversion.

pull/1269/head
Darien Raymond 2018-09-07 14:56:42 +02:00
parent b3847fb7c0
commit 3d3f0a96d6
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
transport/internet/memory_settings.go
View File

@ -17,7 +17,10 @@ func ToMemoryStreamConfig(s *StreamConfig) (*MemoryStreamConfig, error) {
mss := &MemoryStreamConfig{ mss := &MemoryStreamConfig{
ProtocolName: s.GetEffectiveProtocol(), ProtocolName: s.GetEffectiveProtocol(),
ProtocolSettings: ets, ProtocolSettings: ets,
SocketSettings: s.SocketSettings, }
if s != nil {
mss.SocketSettings = s.SocketSettings
} }
if s != nil && s.HasSecuritySettings() { if s != nil && s.HasSecuritySettings() {