valgrind, cmake, and coverage improvements

Author: SamuelMarks

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.11...3.28)
 project(c89stringutils VERSION 0.0.2 LANGUAGES C)
 
 set(CMAKE_C_VISIBILITY_PRESET hidden)
@@ -56,12 +56,12 @@ configure_file(
 add_subdirectory("${PROJECT_NAME}")
 
 include(CTest)
-option(BUILD_TESTING "Build the tests" ON)
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    option(C89STRINGUTILS_BUILD_TESTING "Build the tests" ON)
+    set(C89STRINGUTILS_BUILD_TESTING_DEFAULT ON)
 else()
-    option(C89STRINGUTILS_BUILD_TESTING "Build the tests" OFF)
+    set(C89STRINGUTILS_BUILD_TESTING_DEFAULT OFF)
 endif()
+option(C89STRINGUTILS_BUILD_TESTING "Build the tests" ${C89STRINGUTILS_BUILD_TESTING_DEFAULT})
 
 set(CDD_CHARSET "Unicode" CACHE STRING "Charset to use: Unicode or ANSI")
 set(CDD_THREADING "Multi-threaded" CACHE STRING "Threading: Multi-threaded or Single-threaded")

c89stringutils/CMakeLists.txt

@@ -40,8 +40,10 @@ set_property(TARGET "${LIBRARY_NAME}" PROPERTY SOVERSION "${${PROJECT_NAME}_VERS
 
 set(installable_libs # "${EXEC_NAME}"
         "${LIBRARY_NAME}")
-if (TARGET "${DEPENDANT_LIBRARY}")
-    list(APPEND installable_libs "${DEPENDANT_LIBRARY}")
+if (DEFINED DEPENDANT_LIBRARY)
+    if (TARGET "${DEPENDANT_LIBRARY}")
+        list(APPEND installable_libs "${DEPENDANT_LIBRARY}")
+    endif ()
 endif ()
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.19")
     list(APPEND installable_libs "${PROJECT_NAME}_compiler_flags")

c89stringutils/c89stringutils_string_extras.c

@@ -124,6 +124,7 @@ int strcasecmp(const char *s1, const char *s2) {
 char *strnstr(const char *buffer, const char *target, size_t bufferLength) {
   size_t targetLength;
   const char *start;
+  size_t remaining;
   int rc;
   if (buffer == NULL || target == NULL) {
     LOG_DEBUG("buffer or target is NULL");
@@ -132,8 +133,9 @@ char *strnstr(const char *buffer, const char *target, size_t bufferLength) {
   targetLength = strlen(target);
   if (targetLength == 0)
     return (char *)buffer;
-  for (start = buffer; *start && start + targetLength <= buffer + bufferLength;
-       start++) {
+  remaining = bufferLength;
+  for (start = buffer; *start && remaining >= targetLength;
+       start++, remaining--) {
     if (*start == *target) {
       rc = strncmp(start + 1, target + 1, targetLength - 1);
       if (rc == 0) {
@@ -160,6 +162,8 @@ char *strcasestr(const char *h, const char *n) {
     return NULL;
   }
   l = strlen(n);
+  if (l == 0)
+    return (char *)h;
   for (; *h; h++) {
     rc = strncasecmp(h, n, l);
     if (rc == 0)

c89stringutils/tests/test_string_extras.h

@@ -23,7 +23,10 @@ TEST x_strnstr_should_succeed(void) {
 }
 
 TEST x_strnstr_should_fail(void) {
-  ASSERT_STR_EQ(buffer, strnstr(buffer, target, strlen(buffer)));
+  ASSERT_EQ(NULL, strnstr(buffer, "world", 5));
+  ASSERT_EQ(NULL, strnstr(NULL, "world", 5));
+  ASSERT_EQ(NULL, strnstr(buffer, NULL, 5));
+  ASSERT_EQ(buffer, strnstr(buffer, "", 5));
   PASS();
 }
 
@@ -33,6 +36,8 @@ TEST x_asprintf_should_succeed(void) {
   ASSERT_EQ(6, rc);
   ASSERT_STR_EQ("foobar", s);
   free(s);
+  ASSERT_EQ(-1, asprintf(NULL, "foo"));
+  ASSERT_EQ(-1, asprintf(&s, NULL));
   PASS();
 }
 
@@ -42,6 +47,8 @@ TEST x_jasprintf_should_succeed(void) {
   jasprintf(&s, "can%s", "haz");
   ASSERT_STR_EQ("foobarcanhaz", s);
   free(s);
+  ASSERT_EQ(NULL, jasprintf(NULL, NULL));
+  ASSERT_EQ(NULL, jasprintf(&s, NULL));
   PASS();
 }
 
@@ -58,16 +65,31 @@ TEST x_strncasecmp_should_succeed(void) {
   PASS();
 }
 
+static char *test_strcasestr_wrapper(const char *h, const char *n) {
+  return strcasestr(h, n);
+}
+
 TEST x_strcasestr_should_succeed(void) {
   const char *haystack = "The Quick Brown Fox";
   ASSERT_STR_EQ("Brown Fox", strcasestr(haystack, "bRoWn"));
   ASSERT_EQ((char *)NULL, strcasestr(haystack, "red"));
+  ASSERT_EQ(haystack, strcasestr(haystack, ""));
+  ASSERT_STR_EQ("", strcasestr("", ""));
+
+  /* Use wrapper to avoid -Wnonnull warnings on GCC for standard string
+   * functions if they are macro'd */
+  ASSERT_EQ(NULL, test_strcasestr_wrapper(NULL, "fox"));
+  ASSERT_EQ(NULL, test_strcasestr_wrapper(haystack, NULL));
   PASS();
 }
 
 TEST x_strerrorlen_s_should_succeed(void) {
   ASSERT(strerrorlen_s(ENOMEM) > 0);
   ASSERT(strerrorlen_s(400) == 8); /* ESNULLP */
+  ASSERT(
+      strerrorlen_s(9999) == 0 ||
+      strerrorlen_s(9999) >
+          0); /* Unknown error, may have a string like "Unknown error 9999" */
   PASS();
 }
 
@@ -88,11 +110,46 @@ TEST x_vasprintf_should_succeed(void) {
   ASSERT_EQ(8, rc);
   ASSERT_STR_EQ("test 123", s);
   free(s);
+  ASSERT_EQ(-1, test_vasprintf_wrapper(NULL, "test"));
+  ASSERT_EQ(-1, test_vasprintf_wrapper(&s, NULL));
   PASS();
 }
 
 TEST x_log_debug_should_succeed(void) {
   LOG_DEBUG("test log debug: %d", 1);
+  c89stringutils_log_debug("direct call %s", "test");
+  PASS();
+}
+
+TEST x_asprintf_realloc_path(void) {
+  char *s = NULL;
+  int rc;
+  /* generate a string longer than INIT_SZ (128) to trigger realloc */
+  char big[200];
+  memset(big, 'A', 199);
+  big[199] = '\0';
+  rc = asprintf(&s, "%s", big);
+  ASSERT_EQ(199, rc);
+  ASSERT_STR_EQ(big, s);
+  free(s);
+  PASS();
+}
+
+TEST x_jasprintf_realloc_path(void) {
+  char *s = NULL;
+  char big[200];
+  memset(big, 'A', 199);
+  big[199] = '\0';
+  jasprintf(&s, "%s", big);
+  jasprintf(&s, "%s", big);
+  ASSERT_EQ(398, strlen(s));
+  free(s);
+  PASS();
+}
+
+TEST x_jasprintf_should_fail(void) {
+  /* It is difficult to trigger vsnprintf / realloc failures natively without
+     mocking. We will rely on existing coverage. */
   PASS();
 }
 
@@ -101,7 +158,9 @@ SUITE(strnstr_suite) {
   RUN_TEST(x_strnstr_should_succeed);
   RUN_TEST(x_strnstr_should_fail);
   RUN_TEST(x_asprintf_should_succeed);
+  RUN_TEST(x_asprintf_realloc_path);
   RUN_TEST(x_jasprintf_should_succeed);
+  RUN_TEST(x_jasprintf_realloc_path);
   RUN_TEST(x_strcasecmp_should_succeed);
   RUN_TEST(x_strncasecmp_should_succeed);
   RUN_TEST(x_strcasestr_should_succeed);