Merge pull request #20 from grisu48/rabbitmq

grisu48 · web-flow · commit 4afce8851695 · 2023-03-21T14:06:17.000+01:00
Fix SIGSEGV in receive
diff --git a/rabbitmq.go b/rabbitmq.go
@@ -111,7 +111,7 @@ func (sub *RabbitMQSubscription) Receive() (amqp.Delivery, error) {
 			return msg, nil
 		}
 	}
-	if sub.mq.closed || sub.con.IsClosed() {
+	if sub.mq == nil || sub.mq.closed || sub.con == nil || sub.con.IsClosed() {
 		return amqp.Delivery{}, fmt.Errorf("EOF")
 	}
 	return amqp.Delivery{}, fmt.Errorf("channel unexpectedly closed")

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (sub *RabbitMQSubscription) Receive() (amqp.Delivery, error) {`
`111`	`111`	`return msg, nil`
`112`	`112`	`}`
`113`	`113`	`}`
`114`		`- if sub.mq.closed \|\| sub.con.IsClosed() {`
	`114`	`+ if sub.mq == nil \|\| sub.mq.closed \|\| sub.con == nil \|\| sub.con.IsClosed() {`
`115`	`115`	`return amqp.Delivery{}, fmt.Errorf("EOF")`
`116`	`116`	`}`
`117`	`117`	`return amqp.Delivery{}, fmt.Errorf("channel unexpectedly closed")`