From 4f18dd30e9b9aa9c043cf371765df6a37b8a9265 Mon Sep 17 00:00:00 2001
From: diegomrsantos <diego@status.im>
Date: Thu, 29 Sep 2022 20:02:10 +0200
Subject: [PATCH] Handle trying to write empty byte seq (#780)

---
 libp2p/protocols/connectivity/relay/utils.nim | 14 ++++++++------
 libp2p/stream/chronosstream.nim               |  3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/libp2p/protocols/connectivity/relay/utils.nim b/libp2p/protocols/connectivity/relay/utils.nim
index c5449aaa3..275a26f09 100644
--- a/libp2p/protocols/connectivity/relay/utils.nim
+++ b/libp2p/protocols/connectivity/relay/utils.nim
@@ -64,15 +64,17 @@ proc bridge*(connSrc: Connection, connDst: Connection) {.async.} =
       await futSrc or futDst
       if futSrc.finished():
         bufRead = await futSrc
-        bytesSendFromSrcToDst.inc(bufRead)
-        await connDst.write(@bufSrcToDst[0..<bufRead])
-        zeroMem(addr(bufSrcToDst), bufSrcToDst.high + 1)
+        if bufRead > 0:
+          bytesSendFromSrcToDst.inc(bufRead)
+          await connDst.write(@bufSrcToDst[0..<bufRead])
+          zeroMem(addr(bufSrcToDst), bufSrcToDst.high + 1)
         futSrc = connSrc.readOnce(addr bufSrcToDst[0], bufSrcToDst.high + 1)
       if futDst.finished():
         bufRead = await futDst
-        bytesSendFromDstToSrc += bufRead
-        await connSrc.write(bufDstToSrc[0..<bufRead])
-        zeroMem(addr(bufDstToSrc), bufDstToSrc.high + 1)
+        if bufRead > 0:
+          bytesSendFromDstToSrc += bufRead
+          await connSrc.write(bufDstToSrc[0..<bufRead])
+          zeroMem(addr(bufDstToSrc), bufDstToSrc.high + 1)
         futDst = connDst.readOnce(addr bufDstToSrc[0], bufDstToSrc.high + 1)
   except CancelledError as exc:
     raise exc
diff --git a/libp2p/stream/chronosstream.nim b/libp2p/stream/chronosstream.nim
index d123c98be..7f26a44ee 100644
--- a/libp2p/stream/chronosstream.nim
+++ b/libp2p/stream/chronosstream.nim
@@ -130,6 +130,9 @@ proc completeWrite(
 method write*(s: ChronosStream, msg: seq[byte]): Future[void] =
   # Avoid a copy of msg being kept in the closure created by `{.async.}` as this
   # drives up memory usage
+  if msg.len == 0:
+    trace "Empty byte seq, nothing to write"
+    return
   if s.closed:
     let fut = newFuture[void]("chronosstream.write.closed")
     fut.fail(newLPStreamClosedError())