From 0f5528170d5b21564c57b947606b1e65769db892 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Wed, 10 Nov 2021 15:32:21 +0100
Subject: [PATCH] utils: copy payload before accepting another UDP packet

In d1e1ace3186d ("Allow Flow Routines to be cancellable (#40)"), the
payload was passed to another goroutine and erased by the next packet
to be received if the goroutine did not process it fast enough. Make
a copy before passing it to the goroutine to fix that.
---
 utils/utils.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/utils.go b/utils/utils.go
index 3ac4f1d..b2be4d2 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -155,6 +155,7 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
 	type udpData struct {
 		size    int
 		pktAddr *net.UDPAddr
+		payload []byte
 	}
 
 	stopped := atomic.Value{}
@@ -165,6 +166,8 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
 			u := udpData{}
 			u.size, u.pktAddr, _ = udpconn.ReadFromUDP(payload)
 			if stopped.Load() == false {
+				u.payload = make([]byte, u.size)
+				copy(u.payload, payload[0:u.size])
 				udpDataCh <- u
 			} else {
 				return
@@ -174,7 +177,7 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
 	for {
 		select {
 		case u := <-udpDataCh:
-			process(u.size, payload, u.pktAddr, processor, localIP, addrUDP, name)
+			process(u.size, u.payload, u.pktAddr, processor, localIP, addrUDP, name)
 		case <-stopCh:
 			stopped.Store(true)
 			udpconn.Close()
@@ -185,13 +188,10 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
 }
 
 func process(size int, payload []byte, pktAddr *net.UDPAddr, processor decoder.Processor, localIP string, addrUDP net.UDPAddr, name string) {
-	payloadCut := make([]byte, size)
-	copy(payloadCut, payload[0:size])
-
 	baseMessage := BaseMessage{
 		Src:     pktAddr.IP,
 		Port:    pktAddr.Port,
-		Payload: payloadCut,
+		Payload: payload,
 	}
 	processor.ProcessMessage(baseMessage)