hot fix: don't encode nil socket address

Signed-off-by: Achille Roussel <[email protected]>
dispatchrun · Jun 1, 2023 · 209cdfe · 209cdfe
1 parent ece84e5
commit 209cdfe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/go.sum b/go.sum
@@ -1,5 +1,3 @@
-github.com/google/flatbuffers v23.5.9+incompatible h1:mTPHyMn3/qO7lvBcm5S9p0olWUQgtQhBf2QWiz1U3qA=
-github.com/google/flatbuffers v23.5.9+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
 github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -10,12 +8,6 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
 github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/stealthrocket/wasi-go v0.1.1 h1:9Q9zpKWItoObGjNG5kkllzHx1sksiq/MKfuYd5bB9to=
-github.com/stealthrocket/wasi-go v0.1.1/go.mod h1:LBhZHvAroNNQTejkVTMJZ01ssj3jXF+3Lkbru4cTzGQ=
-github.com/stealthrocket/wasi-go v0.2.0 h1:vSIaa2/08os4K7ThE4zpz1DatehcgVHJjiq36sFRNts=
-github.com/stealthrocket/wasi-go v0.2.0/go.mod h1:LBhZHvAroNNQTejkVTMJZ01ssj3jXF+3Lkbru4cTzGQ=
-github.com/stealthrocket/wasi-go v0.2.1-0.20230601091929-e34600730df8 h1:w/V3IQcjLyMfDxFckSK4wgVONZjzOL9VS5hK1u4OlKA=
-github.com/stealthrocket/wasi-go v0.2.1-0.20230601091929-e34600730df8/go.mod h1:LBhZHvAroNNQTejkVTMJZ01ssj3jXF+3Lkbru4cTzGQ=
 github.com/stealthrocket/wasi-go v0.3.0 h1:+L+DfnHkBmOkUmCbsyO9j1KPqsAFu426jD3HH/7BABc=
 github.com/stealthrocket/wasi-go v0.3.0/go.mod h1:LBhZHvAroNNQTejkVTMJZ01ssj3jXF+3Lkbru4cTzGQ=
 github.com/stealthrocket/wazergo v0.19.0 h1:0ZBya2fBURvV+I2hGl0vcuQ8dgoUvllxQ7aYlZSA5nI=

diff --git a/internal/timemachine/wasicall/codec.go b/internal/timemachine/wasicall/codec.go
@@ -847,7 +847,10 @@ func (c *Codec) EncodeSockAccept(buffer []byte, fd FD, flags FDFlags, newfd FD,
  buffer = encodeFD(buffer, fd)
  buffer = encodeFDFlags(buffer, flags)
  buffer = encodeFD(buffer, newfd)
- return encodeAddr(buffer, addr)
+ if addr != nil {
+ buffer = encodeAddr(buffer, addr)
+ }
+ return buffer
 }
 
 func (c *Codec) DecodeSockAccept(buffer []byte) (fd FD, flags FDFlags, newfd FD, addr SocketAddress, errno Errno, err error) {
@@ -863,7 +866,9 @@ func (c *Codec) DecodeSockAccept(buffer []byte) (fd FD, flags FDFlags, newfd FD,
  if newfd, buffer, err = decodeFD(buffer); err != nil {
  return
  }
- addr, _, err = decodeAddr(buffer)
+ if len(buffer) != 0 {
+ addr, _, err = decodeAddr(buffer)
+ }
  return
 }
 
@@ -1899,9 +1904,9 @@ func encodeAddr(buffer []byte, addr SocketAddress) []byte {
  buffer = encodeInt(buffer, a.Port)
  return encodeBytes(buffer, a.Addr[:])
  case *UnixAddress:
- panic("not implemented") // waiting for upstream support
+ panic("unix domain sockets are not implemented") // waiting for upstream support
  default:
- panic("unreachable")
+ panic("cannot encode unsupported socket address type")
  }
 }