guard_free() all pointers

1 files changed, 13 insertions, 13 deletions

diff --git a/src/str.c b/src/str.c
index 6d671f6..a51929a 100644
--- a/src/str.c
+++ b/src/str.c
@@ -134,7 +134,7 @@ long int strchroff(const char *sptr, int ch) {
     }
 
     result = tmp - orig;
-    free(orig);
+    guard_free(orig)
 
     return result;
 }
@@ -204,7 +204,7 @@ char** split(char *_sptr, const char* delim, size_t max)
     // Preallocate enough records based on the number of delimiters
     char **result = (char **)calloc(split_alloc + 2, sizeof(char *));
     if (!result) {
-        free(sptr);
+        guard_free(sptr)
         return NULL;
     }
 
@@ -226,7 +226,7 @@ char** split(char *_sptr, const char* delim, size_t max)
             break;
         } else {
             if (!result[i]) {
-                free(sptr_begin);
+                guard_free(sptr_begin)
                 return NULL;
             }
             strcpy(result[i], token);
@@ -235,7 +235,7 @@ char** split(char *_sptr, const char* delim, size_t max)
         --x;
         //memcpy(result[i], token, strlen(token) + 1);   // copy the string contents into the record
     }
-    free(sptr_begin);
+    guard_free(sptr_begin)
     sptr_begin = NULL;
     sptr = NULL;
     return result;
@@ -247,9 +247,9 @@ char** split(char *_sptr, const char* delim, size_t max)
  */
 void split_free(char **ptr) {
     for (int i = 0; ptr[i] != NULL; i++) {
-        free(ptr[i]);
+        guard_free(ptr[i])
     }
-    free(ptr);
+    guard_free(ptr)
 }
 
 /**
@@ -361,9 +361,9 @@ char *join_ex(char *separator, ...) {
         if (i < (argc - 1)) {
             strcat(result, separator);
         }
-        free(argv[i]);
+        guard_free(argv[i])
     }
-    free(argv);
+    guard_free(argv)
 
     return result;
 }
@@ -406,8 +406,8 @@ char *substring_between(char *sptr, const char *delims) {
     start++;    // ignore leading delimiter
 
     // Get length of the substring
-    ssize_t length = strlen(start);
-    if (length < 0) {
+    size_t length = strlen(start);
+    if (!length) {
         return NULL;
     }
 
@@ -568,9 +568,9 @@ char **strdeldup(char **arr) {
         result[rec] = strdup(arr[i]);
         if (!result[rec]) {
             for (size_t die = 0; result[die] != NULL; die++) {
-                free(result[die]);
+                guard_free(result[die])
             }
-            free(result);
+            guard_free(result)
             return NULL;
         }
 
@@ -767,7 +767,7 @@ char *normalize_space(char *s) {
 
     // Rewrite the input string
     strcpy(result, tmp_orig);
-    free(tmp_orig);
+    guard_free(tmp_orig)
     return result;
 }