From 3e829c04d1edfde1966a0d3f7f330fadd7ca9cd8 Mon Sep 17 00:00:00 2001
From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Wed, 23 Oct 2019 14:14:08 +0200
Subject: Fixed Ordering::Acquire -> Ordering::SeqCst typo

---
 src/platform/dummy/tun.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/platform/dummy/tun.rs')

diff --git a/src/platform/dummy/tun.rs b/src/platform/dummy/tun.rs
index 9fe9480..fb87d2f 100644
--- a/src/platform/dummy/tun.rs
+++ b/src/platform/dummy/tun.rs
@@ -1,3 +1,4 @@
+use std::cmp::min;
 use std::error::Error;
 use std::fmt;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -84,9 +85,10 @@ impl Reader for TunReader {
 
     fn read(&self, buf: &mut [u8], offset: usize) -> Result<usize, Self::Error> {
         match self.rx.recv() {
-            Ok(m) => {
-                buf[offset..].copy_from_slice(&m[..]);
-                Ok(m.len())
+            Ok(msg) => {
+                let n = min(buf.len() - offset, msg.len());
+                buf[offset..offset + n].copy_from_slice(&msg[..n]);
+                Ok(n)
             }
             Err(_) => Err(TunError::Disconnected),
         }
-- 
cgit v1.2.3-59-g8ed1b