fixed bug when multiple packets come in one parse()

hideakitai · Aug 17, 2018 · cabffd7 · cabffd7
1 parent eb28b05
commit cabffd7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/ArduinoOSC/OSCServer.h b/ArduinoOSC/OSCServer.h
@@ -81,15 +81,14 @@ int16_t OSCServer<usb_serial_class>::parse()
     const size_t size = stream_->available();
     if (size == 0) return 0;
 
-    OSCMessage rcvMes;
-
     uint8_t data[size];
     stream_->readBytes((char*)data, size);
 
     unpacker.feed(data, size);
 
     while (unpacker.available())
     {
+        OSCMessage rcvMes;
         if (decode(rcvMes, unpacker.data()) >= 0)
         {
             adrMatch_.paternComp(rcvMes);
@@ -108,15 +107,14 @@ int16_t OSCServer<HardwareSerial>::parse()
     const size_t size = stream_->available();
     if (size == 0) return 0;
 
-    OSCMessage rcvMes;
-
     uint8_t data[size];
     stream_->readBytes((char*)data, size);
 
     unpacker.feed(data, size);
 
     while (unpacker.available())
     {
+        OSCMessage rcvMes;
         if (decode(rcvMes, unpacker.data()) >= 0)
         {
             adrMatch_.paternComp(rcvMes);
@@ -134,13 +132,13 @@ int16_t OSCServer<WiFiUDP>::parse()
     const size_t size = stream_->parsePacket();
     if (size == 0) return 0;
 
-    OSCMessage rcvMes;
     // rcvMes.setIpAddress(stream_->remoteIP());
     // rcvMes.setPortNumber(stream_->remotePort());
 
     uint8_t data[size];
     stream_->read(data, size);
 
+    OSCMessage rcvMes;
     if (decode(rcvMes, data) < 0) return -1;
     adrMatch_.paternComp(rcvMes);
     return size;

diff --git a/ArduinoOSC/avr/OSCServer.h b/ArduinoOSC/avr/OSCServer.h
@@ -81,15 +81,14 @@ int16_t OSCServer<usb_serial_class>::parse()
     const size_t size = stream_->available();
     if (size == 0) return 0;
 
-    OSCMessage rcvMes;
-
     uint8_t data[size];
     stream_->readBytes((char*)data, size);
 
     unpacker.feed(data, size);
 
     while (unpacker.available())
     {
+        OSCMessage rcvMes;
         if (decode(rcvMes, unpacker.data()) >= 0)
         {
             adrMatch_.paternComp(rcvMes);
@@ -108,15 +107,14 @@ int16_t OSCServer<HardwareSerial>::parse()
     const size_t size = stream_->available();
     if (size == 0) return 0;
 
-    OSCMessage rcvMes;
-
     uint8_t data[size];
     stream_->readBytes((char*)data, size);
 
     unpacker.feed(data, size);
 
     while (unpacker.available())
     {
+        OSCMessage rcvMes;
         if (decode(rcvMes, unpacker.data()) >= 0)
         {
             adrMatch_.paternComp(rcvMes);
@@ -134,13 +132,13 @@ int16_t OSCServer<WiFiUDP>::parse()
     const size_t size = stream_->parsePacket();
     if (size == 0) return 0;
 
-    OSCMessage rcvMes;
     // rcvMes.setIpAddress(stream_->remoteIP());
     // rcvMes.setPortNumber(stream_->remotePort());
 
     uint8_t data[size];
     stream_->read(data, size);
 
+    OSCMessage rcvMes;
     if (decode(rcvMes, data) < 0) return -1;
     adrMatch_.paternComp(rcvMes);
     return size;