Fix CanFdMessage64

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Fixed CanFdMessage64
+
 ## [2.0.1] - 2018-08-23
 ### Fixed
 - Fixed memory leak with introduction of std::shared_ptr

src/Vector/BLF/CanFdMessage64.cpp

@@ -65,6 +65,7 @@ void CanFdMessage64::read(AbstractFile & is)
     is.read(reinterpret_cast<char *>(&dir), sizeof(dir));
     is.read(reinterpret_cast<char *>(&extDataOffset), sizeof(extDataOffset));
     is.read(reinterpret_cast<char *>(&crc), sizeof(crc));
+    data.resize(validDataBytes);
     is.read(reinterpret_cast<char *>(data.data()), static_cast<std::streamsize>(data.size()));
     if (extDataOffset != 0) {
         CanFdExtFrameData::read(is);
@@ -73,6 +74,9 @@ void CanFdMessage64::read(AbstractFile & is)
 
 void CanFdMessage64::write(AbstractFile & os)
 {
+    /* pre processing */
+    validDataBytes = static_cast<WORD>(data.size());
+
     ObjectHeader::write(os);
     os.write(reinterpret_cast<char *>(&channel), sizeof(channel));
     os.write(reinterpret_cast<char *>(&dlc), sizeof(dlc));

src/Vector/BLF/CanFdMessage64.h

@@ -23,7 +23,7 @@
 
 #include <Vector/BLF/platform.h>
 
-#include <array>
+#include <vector>
 
 #include <Vector/BLF/AbstractFile.h>
 #include <Vector/BLF/CanFdExtFrameData.h>
@@ -196,7 +196,7 @@ class VECTOR_BLF_EXPORT CanFdMessage64 final : public ObjectHeader, public CanFd
      * than 64 bytes, according to the value of
      * dlc).
      */
-    std::array<BYTE, 64> data;
+    std::vector<uint8_t> data;
 };
 
 }

src/Vector/BLF/docs/examples/Parser.cpp

@@ -1569,7 +1569,7 @@ void show(Vector::BLF::CanFdMessage * obj)
 void show(Vector::BLF::CanFdMessage64 * obj)
 {
     std::cout << "CanFdMessage64:";
-    std::cout << " channel=" << std::dec << obj->channel;
+    std::cout << " channel=" << std::dec << static_cast<uint16_t>(obj->channel);
     std::cout << " dlc=" << std::dec << static_cast<uint16_t>(obj->dlc);
     std::cout << " validDataBytes=" << std::dec << static_cast<uint16_t>(obj->validDataBytes);
     std::cout << " txCount=" << std::dec << static_cast<uint16_t>(obj->txCount);
@@ -2479,6 +2479,9 @@ int main(int argc, char * argv[])
         case Vector::BLF::ObjectType::ETHERNET_ERROR_FORWARDED:
             show(reinterpret_cast<Vector::BLF::EthernetErrorForwarded *>(ohb));
             break;
+
+        default:
+            std::cout << "Unknown ObjectType" << std::endl;
         }
 
         /* check objectSize */

src/Vector/BLF/tests/unittests/test_CanFdMessage64.cpp

@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE(CanFdMessage64)
     /* CanFdMessage64 */
     BOOST_CHECK_EQUAL(obj->channel, 0x11);
     BOOST_CHECK_EQUAL(obj->dlc, 0x22);
-    BOOST_CHECK_EQUAL(obj->validDataBytes, 0x33);
+    BOOST_CHECK_EQUAL(obj->validDataBytes, 0x40);
     BOOST_CHECK_EQUAL(obj->txCount, 0x44);
     BOOST_CHECK_EQUAL(obj->id, 0x55555555);
     BOOST_CHECK_EQUAL(obj->frameLength, 0x66666666);