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

Timestamp:

09/12/17 11:26:33 (6 years ago)

Author:

Sanahuja Guillaume

Message:

avoid buffer overrun

File:

• trunk/lib/FlairSensorActuator/src/Novatel.cpp (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/Novatel.cpp

@@ -42 +42 @@
 
 void Novatel::Run(void) {
-  char response[200] = {0};
-  int size;
   ssize_t written;
 
@@ -62 +60 @@
 
   while (!ToBeStopped()) {
-    size = 0;
-    while (1) {
-      // ssize_t read = rt_dev_read(uart_fd, &response[size],1);
-      ssize_t Read = serialport->Read(&response[size], 1);
-      if (Read < 0) {
-        Thread::Err("erreur Read (%s)\n", strerror(-Read));
+    char response[1024] = {0};
+    int size = 0;
+    while (!ToBeStopped()) {
+      ssize_t read = serialport->Read(&response[size], 1);
+      if (read < 0) {
+        Thread::Err("erreur Read (%s)\n", strerror(-read));
       }
-      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");
+    }
   }