1 files changed, 5 insertions, 1 deletions

diff --git a/src/ot_livesync.c b/src/ot_livesync.c
index 7d7208e..1381b3b 100644
--- a/src/ot_livesync.c
+++ b/src/ot_livesync.c
@@ -30,7 +30,7 @@ static uint16_t g_port  = LIVESYNC_PORT;
 #define LIVESYNC_INCOMING_BUFFSIZE        (256 * 256)
 
 #define LIVESYNC_OUTGOING_BUFFSIZE_PEERS  1480
-#define LIVESYNC_OUTGOING_WATERMARK_PEERS (sizeof(ot_peer) + sizeof(ot_hash))
+#define LIVESYNC_OUTGOING_WATERMARK_PEERS (sizeof(ot_hash) + OT_PEER_SIZE6)
 
 #define LIVESYNC_MAXDELAY                 15 /* seconds */
 
@@ -127,6 +127,10 @@ static void livesync_issue_peersync(sync_buffer *buf) {
   char   mycopy[LIVESYNC_OUTGOING_BUFFSIZE_PEERS];
   size_t fill = buf->fill;
 
+  /* The flush watermark keeps fill within the buffer */
+  if (fill > LIVESYNC_OUTGOING_BUFFSIZE_PEERS)
+    fill = LIVESYNC_OUTGOING_BUFFSIZE_PEERS;
+
   memcpy(mycopy, buf->data, fill);
   buf->fill             = sizeof(g_tracker_id) + sizeof(uint32_t);
   buf->next_packet_time = time_future_seconds(LIVESYNC_MAXDELAY);