2 files changed, 40 insertions, 9 deletions

diff --git a/lib/config.c b/lib/config.c
index 292c633..0fb17e8 100644
--- a/lib/config.c
+++ b/lib/config.c
@@ -74,8 +74,9 @@ ConfigItem **config_read(const char *filename) {
         // Get a pointer to the key pair separator
         char *sep_pos = strchr(lptr, sep_ch);
         if (!sep_pos) {
-            printf("invalid entry on line %zu: missing '%s': '%s'\n", record, sep_str, lptr);
-            continue;
+            fprintf(stderr, "invalid entry on line %zu: missing '%s': '%s'\n", record, sep_str, lptr);
+            config_free(config);
+            return NULL;
         }
 
         // These values are approximations.  The real length(s) are recorded using strlen below.
@@ -126,8 +127,9 @@ ConfigItem **config_read(const char *filename) {
         // Populate the value, and ignore any inline comments
         while (*lptr) {
             if (*lptr == '#' || *lptr == ';') {
-                // strip trailing whitespace where the comment is and stop processing
-                value = strip(value);
+                // `value` was populated up to the comment.
+                // now strip whitespace from the string `value` actually points to
+                value_orig = strip(value_orig);
                 break;
             }
             *value++ = *lptr++;
@@ -168,6 +170,9 @@ ConfigItem **config_read(const char *filename) {
  * @param item `ConfigItem` array
  */
 void config_free(ConfigItem **item) {
+    if (item == NULL) {
+        return;
+    }
     for (size_t i = 0; item[i] != NULL; i++) {
         free(item[i]->key);
         free(item[i]->value);
diff --git a/lib/strlist.c b/lib/strlist.c
index 1cab324..5c1f0e2 100644
--- a/lib/strlist.c
+++ b/lib/strlist.c
@@ -10,6 +10,9 @@
  * @param pStrList `StrList`
  */
 void strlist_free(StrList *pStrList) {
+    if (pStrList == NULL) {
+        return;
+    }
     for (size_t i = 0; i < pStrList->num_inuse; i++) {
         free(pStrList->data[i]);
     }
@@ -23,7 +26,13 @@ void strlist_free(StrList *pStrList) {
  * @param str
  */
 void strlist_append(StrList *pStrList, char *str) {
-    char **tmp = realloc(pStrList->data, (pStrList->num_alloc + 1) * sizeof(char *));
+    char **tmp = NULL;
+
+    if (pStrList == NULL) {
+        return;
+    }
+
+    tmp = realloc(pStrList->data, (pStrList->num_alloc + 1) * sizeof(char *));
     if (tmp == NULL) {
         strlist_free(pStrList);
         perror("failed to append to array");
@@ -43,7 +52,13 @@ void strlist_append(StrList *pStrList, char *str) {
  * @param pStrList2 `StrList`
  */
 void strlist_append_strlist(StrList *pStrList1, StrList *pStrList2) {
-    size_t count = strlist_count(pStrList2);
+    size_t count = 0;
+
+    if (pStrList1 == NULL || pStrList2 == NULL) {
+        return;
+    }
+
+    count = strlist_count(pStrList2);
     for (size_t i = 0; i < count; i++) {
         char *item = strlist_item(pStrList2, i);
         strlist_append(pStrList1, item);
@@ -97,7 +112,13 @@ static int _strlist_dsc_cmpfn(const void *a, const void *b) {
  * @param mode Available modes: `STRLIST_DEFAULT` (alphabetic), `STRLIST_ASC` (ascending), `STRLIST_DSC` (descending)
  */
 void strlist_sort(StrList *pStrList, unsigned int mode) {
+    // TODO: use strsort_array() instead instead of duplicating effort
     void *fn = NULL;
+
+    if (pStrList == NULL) {
+        return;
+    }
+
     switch (mode) {
         case STRLIST_ASC:
             fn = _strlist_asc_cmpfn;
@@ -121,8 +142,13 @@ void strlist_sort(StrList *pStrList, unsigned int mode) {
 void strlist_reverse(StrList *pStrList) {
     char *tmp = NULL;
     size_t i = 0;
-    size_t j = pStrList->num_inuse - 1;
+    size_t j = 0;
+
+    if (pStrList == NULL) {
+        return;
+    }
 
+    j = pStrList->num_inuse - 1;
     for (i = 0; i < j; i++) {
         tmp = pStrList->data[i];
         pStrList->data[i] = pStrList->data[j];
@@ -149,7 +175,7 @@ size_t strlist_count(StrList *pStrList) {
 void strlist_set(StrList *pStrList, size_t index, char *value) {
     char *tmp = NULL;
     char *item = NULL;
-    if (index > strlist_count(pStrList)) {
+    if (pStrList == NULL || index > strlist_count(pStrList)) {
         return;
     }
     if ((item = strlist_item(pStrList, index)) == NULL) {
@@ -176,7 +202,7 @@ void strlist_set(StrList *pStrList, size_t index, char *value) {
  * @return string
  */
 char *strlist_item(StrList *pStrList, size_t index) {
-    if (index > strlist_count(pStrList)) {
+    if (pStrList == NULL || index > strlist_count(pStrList)) {
         return NULL;
     }
     return pStrList->data[index];