Changeset 196 in flair-src for trunk/lib/FlairSensorActuator/src/Mb800.cpp

Timestamp:

Sep 12, 2017, 11:26:33 AM (7 years ago)

Author:

Sanahuja Guillaume

Message:

avoid buffer overrun

File:

• trunk/lib/FlairSensorActuator/src/Mb800.cpp (modified) (3 diffs)

trunk/lib/FlairSensorActuator/src/Mb800.cpp

@@ -43 +43 @@
 
 void Mb800::Run(void) {
-  char response[200] = {0};
-  int size,written;
+  int written;
 
   /** Debut config **/
@@ -103 +102 @@
   /** Debut running loop **/
   WarnUponSwitches(true);
-
+  
   while (!ToBeStopped()) {
-    //SleepMS(10);??
-    size = 0;
+    char response[1024] = {0};
+    int size = 0;
     while (!ToBeStopped()) {
       ssize_t read = serialport->Read(&response[size], 1);
@@ -113 +112 @@
       }
 
-      if (response[size] == 0x0a)
-        break;
+      if (response[size] == 0x0a ) break;
       size++;
+      if (size==sizeof(response)) break;
     }
-    size++;
-    parseFrame(response, size);
+    if (size!=sizeof(response)) {
+      size++;
+      parseFrame(response, size);
+    } else {
+      Thread::Warn("frame too long for buffer\n");
+    }
   }
+  
   /** fin running loop **/
   WarnUponSwitches(false);