xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: nil pointer

Browse source
This commit is contained in:
gVisor bot 2022-08-12 12:49:35 +08:00
parent 40cab0094e
commit 65d543329e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constant/metadata.go
View file

@ -127,9 +127,9 @@ func (m *Metadata) SourceDetail() string {
return fmt.Sprintf("[%s]", ClashName) return fmt.Sprintf("[%s]", ClashName)
} }
if m.Process != "" && *m.Uid != -1 { if m.Process != "" && m.Uid != nil {
return fmt.Sprintf("%s(%s, uid=%d)", m.SourceAddress(), m.Process, *m.Uid) return fmt.Sprintf("%s(%s, uid=%d)", m.SourceAddress(), m.Process, *m.Uid)
} else if *m.Uid != -1 { } else if m.Uid != nil {
return fmt.Sprintf("%s(uid=%d)", m.SourceAddress(), *m.Uid) return fmt.Sprintf("%s(uid=%d)", m.SourceAddress(), *m.Uid)
} else if m.Process != "" { } else if m.Process != "" {
return fmt.Sprintf("%s(%s)", m.SourceAddress(), m.Process) return fmt.Sprintf("%s(%s)", m.SourceAddress(), m.Process)

4
tunnel/tunnel.go
View file

@ -403,7 +403,9 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
} else { } else {
metadata.Process = filepath.Base(path) metadata.Process = filepath.Base(path)
metadata.ProcessPath = path metadata.ProcessPath = path
metadata.Uid = &uid if uid != -1 {
metadata.Uid = &uid
}
processFound = true processFound = true
} }
} }