TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-10 01:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/netmon: remove extra panic guard around ParseRIB

Browse Source 
This was an extra defense added for #14201 that is no longer required.

Fixes #14201

Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker 2024-12-05 14:02:30 -08:00 committed by James Tucker
parent 220dc56f01
commit de9d4b2f88
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/netmon/netmon_darwin.go
View File

@ -56,18 +56,7 @@ func (m *darwinRouteMon) Receive() (message, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
msgs, err := func() (msgs []route.Message, err error) { msgs, err := route.ParseRIB(route.RIBTypeRoute, m.buf[:n])
defer func() {
// TODO(raggi,#14201): remove once we've got a fix from
// golang/go#70528.
msg := recover()
if msg != nil {
msgs = nil
err = fmt.Errorf("panic in route.ParseRIB: %s", msg)
}
}()
return route.ParseRIB(route.RIBTypeRoute, m.buf[:n])
}()
if err != nil { if err != nil {
if debugRouteMessages { if debugRouteMessages {
m.logf("read %d bytes (% 02x), failed to parse RIB: %v", n, m.buf[:n], err) m.logf("read %d bytes (% 02x), failed to parse RIB: %v", n, m.buf[:n], err)