Fix asan error and re-enable pubsub_udpmc_tests.

apache · Aug 24, 2023 · a76ad79 · a76ad79
1 parent 697e7ed
commit a76ad79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/bundles/pubsub/integration/CMakeLists.txt b/bundles/pubsub/integration/CMakeLists.txt
@@ -160,6 +160,8 @@ if (PUBSUB_INTEGRATION)
                 )
         target_link_libraries(pubsub_udpmc_tests PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main)
         target_include_directories(pubsub_udpmc_tests SYSTEM PRIVATE gtest)
+        add_test(NAME pubsub_udpmc_tests COMMAND pubsub_udpmc_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_udpmc_tests,CONTAINER_LOC>)
+        setup_target_for_coverage(pubsub_udpmc_tests SCAN_DIR ..)
 
         add_celix_container(pstm_deadlock_udpmc_test
                 USE_CONFIG #ensures that a config.properties will be created with the launch bundles.

diff --git a/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_receiver.c b/bundles/pubsub/pubsub_admin_udp_mc/src/pubsub_udpmc_topic_receiver.c
@@ -485,7 +485,7 @@ static void psa_udpmc_processMsg(pubsub_udpmc_topic_receiver_t *receiver, pubsub
             if (validVersion) {
                 struct iovec deSerializeBuffer;
                 deSerializeBuffer.iov_base = msg->payload;
-                deSerializeBuffer.iov_len  = 0;
+                deSerializeBuffer.iov_len  = msg->payloadSize;
                 celix_status_t status = msgSer->deserialize(msgSer->handle, &deSerializeBuffer, 0, &msgInst);
 
                 if (status == CELIX_SUCCESS) {

diff --git a/libs/dfi/src/json_serializer.c b/libs/dfi/src/json_serializer.c
@@ -57,7 +57,7 @@ int jsonSerializer_deserialize(dyn_type *type, const char *input, size_t length,
         json_decref(root);
     } else {
         status = ERROR;
-        LOG_ERROR("Error parsing json input '%s'. Error is: %s\n", input, error.text);
+        LOG_ERROR("Error parsing json input '%.*s'. Error is: %s\n", (int)length, input, error.text);
     }
 
     if (status != OK) {