From ff48ee4c5becc666c48efbcef87d650bd81884ee Mon Sep 17 00:00:00 2001
From: arve0 <arve.seljebu@gmail.com>
Date: Mon, 16 Mar 2015 21:23:01 +0100
Subject: [PATCH] do not trust received msg length to read forever

---
 libraries/Bridge/src/Bridge.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/Bridge/src/Bridge.cpp b/libraries/Bridge/src/Bridge.cpp
index c772dee8e..677316e31 100644
--- a/libraries/Bridge/src/Bridge.cpp
+++ b/libraries/Bridge/src/Bridge.cpp
@@ -191,12 +191,13 @@ uint16_t BridgeClass::transfer(const uint8_t *buff1, uint16_t len1,
 
     // Recv data
     for (uint16_t i = 0; i < l; i++) {
+      // Cut received data if rxbuffer is too small
+      if (i >= rxlen)
+          break;
       int c = timedRead(5);
       if (c < 0)
         continue;
-      // Cut received data if rxbuffer is too small
-      if (i < rxlen)
-        rxbuff[i] = c;
+      rxbuff[i] = c;
       crcUpdate(c);
     }