Changeset 133 in code for trunk/user.go

Timestamp:

Mar 21, 2020, 7:29:44 AM (5 years ago)

Author:

contact

Message:

Drop messages on closed connections

This prevents this panic:

panic: send on closed channel
goroutine 9 [running]:
git.sr.ht/~emersion/soju.(*upstreamConn).SendMessage(...)

/home/simon/src/soju/upstream.go:866

git.sr.ht/~emersion/soju.(*upstreamConn).handleMessage(0xc000084b40, 0xc000144680, 0x2, 0x0)

/home/simon/src/soju/upstream.go:152 +0x62b

git.sr.ht/~emersion/soju.(*user).run(0xc0000b8070)

/home/simon/src/soju/user.go:144 +0x53d

created by git.sr.ht/~emersion/soju.(*Server).Run

/home/simon/src/soju/server.go:88 +0x286

File:

• trunk/user.go (modified) (2 diffs)

trunk/user.go

@@ -149 +149 @@
                 case upstreamMsg := <-u.upstreamIncoming:
                         msg, uc := upstreamMsg.msg, upstreamMsg.uc
+                        if uc.closed {
+                                uc.logger.Printf("ignoring message on closed connection: %v", msg)
+                                break
+                        }
                         if err := uc.handleMessage(msg); err != nil {
                                 uc.logger.Printf("failed to handle message %q: %v", msg, err)
@@ -154 +158 @@
                 case downstreamMsg := <-u.downstreamIncoming:
                         msg, dc := downstreamMsg.msg, downstreamMsg.dc
+                        if dc.isClosed() {
+                                dc.logger.Printf("ignoring message on closed connection: %v", msg)
+                                break
+                        }
                         err := dc.handleMessage(msg)
                         if ircErr, ok := err.(ircError); ok {