Quellcode durchsuchen

Fixes segfaults in tests

Signed-off-by: CapXilinx <melik-merkumians@acin.tuwien.ac.at>
CapXilinx vor 8 Jahren
Ursprung
Commit
c1d9c41a6f

+ 2 - 2
source/tests/cip/cipconnectionobjecttest.cpp

@@ -241,9 +241,9 @@ TEST(CipConnectionObject, ParseConnectionData) {
 "\x34\x12\x00\x00\x00\x00\xe0\x93\x04\x00\x02\x40\xa0\x86\x01\x00" \
 "\x22\x20\x01\x04\x20\x04\x24\x97\x2c\x98\x2c\x64";
 
-  const CipOctet **message_runner = (const CipOctet **)&message;
+  const CipOctet *message_runner = (const CipOctet*)message;
 
-  ConnectionObjectInitializeFromMessage(message_runner, &connection_object);
+  ConnectionObjectInitializeFromMessage(&message_runner, &connection_object);
   CipUdint o_to_t_network_connection_id = ConnectionObjectGetCipConsumedConnectionID(&connection_object);
   CHECK_EQUAL(0, o_to_t_network_connection_id);
 

+ 3 - 2
source/tests/cip/cipelectronickeytest.cpp

@@ -154,9 +154,10 @@ TEST(CipElectronicKey, ParseElectronicKeyTest) {
   /* Size of an electronic key is 1 + 1 + 8 (Segment, Key format, Key) */
   const CipOctet message[] =
   {0x34, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x84, 0x05};
-  GetElectronicKeyFormat4FromMessage((const CipOctet**)&message, key);
-
   const CipOctet *message_buffer = message;
+  GetElectronicKeyFormat4FromMessage((const CipOctet**)&message_buffer, key);
+
+  message_buffer = message;
   CHECK_EQUAL( 256, ElectronicKeyFormat4GetVendorId(key) );
   CHECK_EQUAL( 512, ElectronicKeyFormat4GetDeviceType(key) );
   CHECK_EQUAL( 768, ElectronicKeyFormat4GetProductCode(key) );

+ 2 - 2
source/tests/cip/cipepathtest.cpp

@@ -288,10 +288,10 @@ TEST(CipEpath, GetLogicalSegmentElectronicKeyFormat4) {
   /* Size of an electronic key is 1 + 1 + 8 (Segment, Key format, Key) */
   const CipOctet message[] =
   {0x34, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x04, 0x05};
-  const CipOctet **message_pp = (const CipOctet**)&message;
+  const CipOctet *message_pp = (const CipOctet*)message;
   const CipOctet *message_buffer = message;
   ElectronicKeyFormat4 *electronic_key = ElectronicKeyFormat4New();
-  GetElectronicKeyFormat4FromMessage(message_pp, electronic_key);
+  GetElectronicKeyFormat4FromMessage(&message_pp, electronic_key);
 
   MEMCMP_EQUAL(message_buffer + 2, electronic_key, 8);