CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-08-10 13:20:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Ping upstream cause ctrld crash

Browse Source 
dohTransport returns a http.RoundTripper. When pinging upstream, we do
it both for doh and doh3, and checking whether the transport is nil
before performing the check.

However, dohTransport returns a concrete *http.Transport. Thus
dohTransport will always return a non-nil http.Roundtripper, causing
invalid memory dereference when upstream is configured to use doh3.

Performing ping upstream separately will fix the issue.
This commit is contained in:
Cuong Manh Le
2023-08-09 23:54:23 +07:00
committed by Cuong Manh Le
parent ab1d7fd796
commit 3f3c1d6d78
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.go
+6 -2
View File
@@ -407,8 +407,12 @@ func (uc *UpstreamConfig) Ping() {
} }
for _, typ := range []uint16{dns.TypeA, dns.TypeAAAA} { for _, typ := range []uint16{dns.TypeA, dns.TypeAAAA} {
ping(uc.dohTransport(typ)) switch uc.Type {
ping(uc.doh3Transport(typ)) case ResolverTypeDOH:
ping(uc.dohTransport(typ))
case ResolverTypeDOH3:
ping(uc.doh3Transport(typ))
}
} }
} }