Replace sprintf usage with snprintf or asprintf

CMakeLists.txt

@@ -80,9 +80,12 @@ endif ()
 
 # Set C specific flags
 set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
-set(CMAKE_C_FLAGS "-Wall -Werror -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "-Wall -Werror -Wformat -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")
 
 # Set C++ specific flags
+set(CMAKE_CXX_FLAGS "-fno-rtti ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -Weffc++ -Wformat -Wno-error=deprecated-declarations ${CMAKE_CXX_FLAGS}")
+
 if (NOT DEFINED CMAKE_CXX_STANDARD)
     #Celix header only C++ supported is based on C++14 and C++17.
     #Default using C++14 to ensure the code compiles for C++14.
@@ -91,9 +94,6 @@ if (NOT DEFINED CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 14)
 endif ()
 
-set(CMAKE_CXX_FLAGS "-fno-rtti ${CMAKE_CXX_FLAGS}")
-set(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -Weffc++ -Wno-error=deprecated-declarations ${CMAKE_CXX_FLAGS}")
-
 if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)
 endif()

bundles/deployment_admin/src/deployment_admin.c

@@ -16,13 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/**
- * deployment_admin.c
- *
- *  \date       Nov 7, 2011
- *  \author    	<a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- *  \copyright	Apache License, Version 2.0
- */
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -136,16 +129,6 @@ celix_status_t deploymentAdmin_create(bundle_context_pt context, deployment_admi
 			(*admin)->pollUrl = strdup(pollUrl);
 			(*admin)->auditlogUrl = strdup(auditlogUrl);
 
-//				log_store_pt store = NULL;
-//				log_t *log = NULL;
-//				log_sync_pt sync = NULL;
-//				logStore_create(subpool, &store);
-//				log_create(subpool, store, &log);
-//				logSync_create(subpool, (*admin)->targetIdentification, store, &sync);
-//
-//				log_log(log, 20000, NULL);
-
-
 			celixThread_create(&(*admin)->poller, NULL, deploymentAdmin_poll, *admin);
 		}
 	}
@@ -199,19 +182,22 @@ static celix_status_t deploymentAdmin_performRequest(deployment_admin_pt admin,
         fw_log(celix_frameworkLogger_globalLogger(), CELIX_LOG_LEVEL_ERROR, "Error initializing curl.");
     }
 
-    char url[strlen(admin->auditlogUrl)+6];
-    sprintf(url, "%s/send", admin->auditlogUrl);
+    char* url;
+    int rc = asprintf(&url, "%s/send", admin->auditlogUrl);
+    status = rc < 0 ? CELIX_ENOMEM : CELIX_SUCCESS;
 
     if (status == CELIX_SUCCESS) {
             curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
             curl_easy_setopt(curl, CURLOPT_URL, url);
             curl_easy_setopt(curl, CURLOPT_POSTFIELDS, entry);
             res = curl_easy_perform(curl);
-
             if (res != CURLE_OK ) {
                 status = CELIX_BUNDLE_EXCEPTION;
-                fw_log(celix_frameworkLogger_globalLogger(), CELIX_LOG_LEVEL_ERROR, "Error sending auditlog, got curl error code %d", res);
+                fw_log(celix_frameworkLogger_globalLogger(), CELIX_LOG_LEVEL_ERROR, "Error sending auditlog to %s, got curl error code %d", url, res);
             }
+            free(url);
+    } else {
+        fw_log(celix_frameworkLogger_globalLogger(), CELIX_LOG_LEVEL_ERROR, "Error creating send url for audit log url: %s", admin->auditlogUrl);
     }
 
     return status;

bundles/logging/log_service_api/include/celix_log_service.h

@@ -50,38 +50,38 @@ typedef struct celix_log_service {
     /**
      * Logs a trace message, printf style.
      */
-    void (*trace)(void *handle, const char* format, ...);
+    void (*trace)(void *handle, const char* format, ...) __attribute__((format(printf,2,3)));
 
     /**
      * Logs a debug message, printf style.
      */
-    void (*debug)(void *handle, const char* format, ...);
+    void (*debug)(void *handle, const char* format, ...) __attribute__((format(printf,2,3)));
 
     /**
      * Logs a info message, printf style.
      */
-    void (*info)(void *handle, const char* format, ...);
+    void (*info)(void *handle, const char* format, ...) __attribute__((format(printf,2,3)));
 
     /**
      * Logs a warning message, printf style.
      */
-    void (*warning)(void *handle, const char* format, ...);
+    void (*warning)(void *handle, const char* format, ...) __attribute__((format(printf,2,3)));
 
     /**
      * Logs a error message, printf style.
      */
-    void (*error)(void *handle, const char* format, ...);
+    void (*error)(void *handle, const char* format, ...) __attribute__((format(printf,2,3)));
 
     /**
      * Logs a fatal message, printf style.
      */
-    void (*fatal)(void *handle, const char* format, ...);
+    void (*fatal)(void *handle, const char* format, ...) __attribute__((format(printf,2,3)));
 
     /**
      * Logs a message using the provided log level, printf style
      * Silently ignores log level CELIX_LOG_LEVEL_DISABLED.
      */
-    void (*log)(void *handle, celix_log_level_e level, const char* format, ...);
+    void (*log)(void *handle, celix_log_level_e level, const char* format, ...) __attribute__((format(printf,3,4)));
 
     /**
      * Logs a message using the provided log level, printf style
@@ -92,13 +92,22 @@ typedef struct celix_log_service {
      *
      * If the argument file or function is NULL, the arguments file, function and line are not used.
      */
-    void (*logDetails)(void *handle, celix_log_level_e level, const char* file, const char* function, int line, const char* format, ...);
+    void (*logDetails)(
+            void *handle, celix_log_level_e level,
+            const char* file,
+            const char* function,
+            int line,
+            const char* format, ...) __attribute__((format(printf,6,7)));
 
     /**
      * Log a message using a format string and va_list argument (vprintf style)
      * Silently ignores log level CELIX_LOG_LEVEL_DISABLED.
      */
-    void (*vlog)(void *handle, celix_log_level_e level, const char* format, va_list formatArgs);
+    void (*vlog)(
+            void *handle,
+            celix_log_level_e level,
+            const char* format,
+            va_list formatArgs) __attribute__((format(printf,3,0)));
 
     /**
      * Log a detailed message using a format string and va_list argument (vprintf style)
@@ -109,7 +118,14 @@ typedef struct celix_log_service {
      *
      * If the argument file or function is NULL, the arguments file, function and line are not used.
      */
-    void (*vlogDetails)(void *handle, celix_log_level_e level, const char* file, const char* function, int line, const char* format, va_list formatArgs);
+    void (*vlogDetails)(
+            void *handle,
+            celix_log_level_e level,
+            const char* file,
+            const char* function,
+            int line,
+            const char* format,
+            va_list formatArgs) __attribute__((format(printf,6,0)));
 } celix_log_service_t;
 
 #ifdef __cplusplus

bundles/logging/log_writers/syslog_writer/gtest/src/SyslogWriterTestSuite.cc

@@ -91,7 +91,7 @@ TEST_F(SyslogWriterTestSuite, LogToSysLog) {
                 buf[i] = 'A';
             }
             buf[2047] = '\0';
-            ls->fatal(ls->handle, buf);
+            ls->fatal(ls->handle, "%s", buf);
         };
         bool called = celix_bundleContext_useServiceWithOptions(ctx.get(), &opts);
         EXPECT_TRUE(called);

bundles/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c

@@ -1034,16 +1034,13 @@ int pubsub_tcpHandler_write(pubsub_tcpHandler_t *handle, pubsub_protocol_message
             message->header.payloadOffset = 0;
             message->header.isLastSegment = 1;
 
-            void *metadataData = NULL;
             size_t metadataSize = 0;
             if (message->metadata.metadata) {
-                metadataSize = entry->writeMetaBufferSize;
-                metadataData = entry->writeMetaBuffer;
+                handle->protocol->encodeMetadata(handle->protocol->handle, message, &entry->writeMetaBuffer, &entry->writeMetaBufferSize, &metadataSize);
                 // When maxMsgSize is smaller then meta data is disabled
-                if (metadataSize > entry->maxMsgSize) {
+               if (metadataSize > entry->maxMsgSize) {
                     metadataSize = 0;
                 }
-                handle->protocol->encodeMetadata(handle->protocol->handle, message, &metadataData, &metadataSize);
             }
 
             message->header.metadataSize = metadataSize;
@@ -1119,10 +1116,10 @@ int pubsub_tcpHandler_write(pubsub_tcpHandler_t *handle, pubsub_protocol_message
 
                 // Write optional metadata in vector buffer
                 if (allPayloadAdded &&
-                    (metadataSize != 0 && metadataData) &&
+                    (metadataSize != 0 && entry->writeMetaBuffer) &&
                     (msgPartSize < maxMsgSize) &&
                     (msg.msg_iovlen-1 < max_msg_iov_len)) {  // header is already included
-                    msg.msg_iov[msg.msg_iovlen].iov_base = metadataData;
+                    msg.msg_iov[msg.msg_iovlen].iov_base = entry->writeMetaBuffer;
                     msg.msg_iov[msg.msg_iovlen].iov_len = metadataSize;
                     msg.msg_iovlen++;
                     msgPartSize += metadataSize;
@@ -1202,9 +1199,6 @@ int pubsub_tcpHandler_write(pubsub_tcpHandler_t *handle, pubsub_protocol_message
                 if (payloadData && (payloadData != message->payload.payload)) {
                     free(payloadData);
                 }
-                if (metadataData && metadataSize > 0) {
-                    free(metadataData);
-                }
             }
             celixThreadMutex_unlock(&entry->writeMutex);
         }

bundles/pubsub/pubsub_admin_zmq/src/pubsub_zmq_topic_sender.c

@@ -438,9 +438,10 @@ static int psa_zmq_topicPublicationSend(void* handle, unsigned int msgTypeId, co
     size_t payloadLength = 0;
     sender->protocol->encodePayload(sender->protocol->handle, &message, &payloadData, &payloadLength);
 
+    size_t metadataSize = 0;
     if (metadata != NULL) {
         message.metadata.metadata = metadata;
-        sender->protocol->encodeMetadata(sender->protocol->handle, &message, &sender->zmqBuffers.metadataBuffer, &sender->zmqBuffers.metadataBufferSize);
+        sender->protocol->encodeMetadata(sender->protocol->handle, &message, &sender->zmqBuffers.metadataBuffer, &sender->zmqBuffers.metadataBufferSize, &metadataSize);
     } else {
         message.metadata.metadata = NULL;
     }
@@ -452,7 +453,7 @@ static int psa_zmq_topicPublicationSend(void* handle, unsigned int msgTypeId, co
     message.header.msgMajorVersion = majorVersion;
     message.header.msgMinorVersion = minorversion;
     message.header.payloadSize = payloadLength;
-    message.header.metadataSize = sender->zmqBuffers.metadataBufferSize;
+    message.header.metadataSize = metadataSize;
     message.header.payloadPartSize = payloadLength;
     message.header.payloadOffset = 0;
     message.header.isLastSegment = 1;
@@ -484,7 +485,7 @@ static int psa_zmq_topicPublicationSend(void* handle, unsigned int msgTypeId, co
 
         //send Payload
         if (rc > 0) {
-            int flag = ((sender->zmqBuffers.metadataBufferSize > 0)  || (sender->zmqBuffers.footerBufferSize > 0)) ? ZMQ_SNDMORE : 0;
+            int flag = ((metadataSize > 0)  || (sender->zmqBuffers.footerBufferSize > 0)) ? ZMQ_SNDMORE : 0;
             zmq_msg_init_data(&msg2, payloadData, payloadLength, psa_zmq_freeMsg, freeMsgEntry);
             rc = zmq_msg_send(&msg2, socket, flag);
             if (rc == -1) {
@@ -494,9 +495,9 @@ static int psa_zmq_topicPublicationSend(void* handle, unsigned int msgTypeId, co
         }
 
         //send MetaData
-        if (rc > 0 && sender->zmqBuffers.metadataBufferSize > 0) {
+        if (rc > 0 && metadataSize > 0) {
             int flag = (sender->zmqBuffers.footerBufferSize > 0 ) ? ZMQ_SNDMORE : 0;
-            zmq_msg_init_data(&msg3, sender->zmqBuffers.metadataBuffer, sender->zmqBuffers.metadataBufferSize, NULL, NULL);
+            zmq_msg_init_data(&msg3, sender->zmqBuffers.metadataBuffer, metadataSize, NULL, NULL);
             rc = zmq_msg_send(&msg3, socket, flag);
             if (rc == -1) {
                 L_WARN("Error sending metadata msg. %s", strerror(errno));
@@ -519,8 +520,8 @@ static int psa_zmq_topicPublicationSend(void* handle, unsigned int msgTypeId, co
         zmsg_t *msg = zmsg_new();
         zmsg_addmem(msg, sender->zmqBuffers.headerBuffer, sender->zmqBuffers.headerBufferSize);
         zmsg_addmem(msg, payloadData, payloadLength);
-        if (sender->zmqBuffers.metadataBufferSize > 0) {
-            zmsg_addmem(msg, sender->zmqBuffers.metadataBuffer, sender->zmqBuffers.metadataBufferSize);
+        if (metadataSize > 0) {
+            zmsg_addmem(msg, sender->zmqBuffers.metadataBuffer, metadataSize);
         }
         if (sender->zmqBuffers.footerBufferSize > 0) {
             zmsg_addmem(msg, sender->zmqBuffers.footerBuffer, sender->zmqBuffers.footerBufferSize);

bundles/pubsub/pubsub_protocol/pubsub_protocol_lib/gtest/CMakeLists.txt

@@ -15,14 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set(SOURCES
-        src/main.cc
-        src/PS_WP_common_tests.cc
-    )
-add_executable(celix_pswp_common_tests ${SOURCES})
-#target_include_directories(celix_cxx_pswp_tests SYSTEM PRIVATE gtest)
+add_executable(celix_pswp_common_tests src/PS_WP_common_tests.cc)
 target_include_directories(celix_pswp_common_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src)
-target_link_libraries(celix_pswp_common_tests PRIVATE celix_pubsub_protocol_lib GTest::gtest Celix::pubsub_spi)
+target_link_libraries(celix_pswp_common_tests PRIVATE celix_pubsub_protocol_lib GTest::gtest Celix::pubsub_spi GTest::gtest_main ${CMAKE_DL_LIBS})
+if (NOT ENABLE_ADDRESS_SANITIZER)
+    target_compile_definitions(celix_pswp_common_tests PRIVATE ENABLE_MALLOC_RETURN_NULL_TESTS)
+endif ()
 
 add_test(NAME celix_pswp_common_tests COMMAND celix_pswp_common_tests)
 setup_target_for_coverage(celix_pswp_common_tests SCAN_DIR ..)