修复xy.h中所有可能导致潜在内存泄漏的代码

Author: Mikachu2333

lib/xy.h

@@ -9,7 +9,7 @@
  *               | BingChunMoLi <bingchunmoli@bingchunmoli.com>
  *               |
  * Created On    : <2023-08-28>
- * Last Modified : <2025-12-31>
+ * Last Modified : <2026-03-17>
  *
  *
  *                     xy: 襄阳、咸阳
@@ -23,7 +23,7 @@
 #ifndef XY_H
 #define XY_H
 
-#define _XY_Version       "v0.2.2.0-2025/10/28"
+#define _XY_Version       "v0.2.2.1-2026/03/17"
 #define _XY_Maintain_URL  "https://github.com/RubyMetric/chsrc/blob/dev/lib/xy.h"
 #define _XY_Maintain_URL2 "https://gitee.com/RubyMetric/chsrc/blob/dev/lib/xy.h"
 
@@ -261,14 +261,12 @@ xy_str_gsub (const char *str, const char *pat, const char *replace)
   size_t replace_len = strlen (replace);
   size_t pat_len = strlen (pat);
 
-  int unit = replace_len - pat_len;
-  if (unit <= 0)
-    unit = 0;
+  size_t unit = (replace_len > pat_len) ? (replace_len - pat_len) : 0;
 
   size_t len = strlen (str);
 
   const char *cur = str;
-  int count = 0;
+  size_t count = 0;
 
   while (cur < str + len)
     {
@@ -284,6 +282,7 @@ xy_str_gsub (const char *str, const char *pat, const char *replace)
   // puti(count); DEBUG 匹配次数
 
   char *ret = malloc (unit * count + len + 1);
+  if (!ret) return NULL;
   char *retcur = ret;
 
   cur = str;
@@ -375,14 +374,17 @@ xy_strcat (unsigned int count, ...)
       if (need_realloc)
         {
           ptrdiff_t diff = cur - ret;
-          ret = realloc (ret, al_cur);
+          char *new_ret = realloc (ret, al_cur);
+          if (NULL == new_ret)
+            {
+              _xy_internal_warn ("xy_strcat(): No available memory to allocate!");
+              free (ret);
+              va_end (args);
+              return NULL;
+            }
+          ret = new_ret;
           cur = ret + diff;
         }
-      if (NULL == ret)
-        {
-          _xy_internal_warn ("xy_strcat(): No availble memory to allocate!");
-          return NULL;
-        }
       strcpy (cur, str);
       // puts(ret);
       cur += strlen (str);
@@ -485,11 +487,15 @@ _xy_str_to_terminal_style (int style, const char *str)
     }
 
 
-  size_t len = 0;
 new_str:
   // -2 把中间%s减掉
-  len = strlen (color_fmt_str) - 2;
+  size_t len = strlen (color_fmt_str) - 2;
   char *buf = malloc (strlen (str) + len + 1);
+  if (!buf)
+    {
+      _xy_internal_warn ("_xy_str_to_terminal_style(): No available memory to allocate!");
+      return NULL;
+    }
   sprintf (buf, color_fmt_str, str);
   return buf;
 }
@@ -804,20 +810,28 @@ _xy_log (int level, const char *prompt, const char *content)
     }
   else if (level & _XY_Log_Success)
     {
-      str = xy_strcat (3, prompt,  ": ", xy_str_to_green (content));
+      char *colored = xy_str_to_green (content);
+      str = xy_strcat (3, prompt,  ": ", colored);
+      free (colored);
     }
   else if (level & _XY_Log_Info)
     {
-      str = xy_strcat (3, prompt,  ": ", xy_str_to_blue (content));
+      char *colored = xy_str_to_blue (content);
+      str = xy_strcat (3, prompt,  ": ", colored);
+      free (colored);
     }
   else if (level & _XY_Log_Warn)
     {
-      str = xy_strcat (3, prompt,  ": ", xy_str_to_yellow (content));
+      char *colored = xy_str_to_yellow (content);
+      str = xy_strcat (3, prompt,  ": ", colored);
+      free (colored);
       to_stderr = true;
     }
   else if (level & _XY_Log_Error)
     {
-      str = xy_strcat (3, prompt,  ": ", xy_str_to_red (content));
+      char *colored = xy_str_to_red (content);
+      str = xy_strcat (3, prompt,  ": ", colored);
+      free (colored);
       to_stderr = true;
     }
   else
@@ -881,29 +895,45 @@ _xy_log_brkt (int level, const char *prompt1, const char *prompt2, const char *c
   else if (level & _XY_Log_Success)
     {
       /* [app 成功]  [app success] */
-      str = xy_strcat (6,
-        "[", xy_str_to_green (prompt1), " ", xy_str_to_bold (xy_str_to_green (prompt2)), "] ", xy_str_to_green (content));
+      char *p1       = xy_str_to_green (prompt1);
+      char *p2_inner = xy_str_to_green (prompt2);
+      char *p2       = xy_str_to_bold (p2_inner);
+      char *c        = xy_str_to_green (content);
+      str = xy_strcat (6, "[", p1, " ", p2, "] ", c);
+      free (p1); free (p2_inner); free (p2); free (c);
     }
   else if (level & _XY_Log_Info)
     {
       /* [app 信息]  [app info]
          [app 提示]  [app notice]
       */
-      str = xy_strcat (6,
-        "[", xy_str_to_blue (prompt1), " ", xy_str_to_bold (xy_str_to_blue (prompt2)), "] ", xy_str_to_blue (content));
+      char *p1       = xy_str_to_blue (prompt1);
+      char *p2_inner = xy_str_to_blue (prompt2);
+      char *p2       = xy_str_to_bold (p2_inner);
+      char *c        = xy_str_to_blue (content);
+      str = xy_strcat (6, "[", p1, " ", p2, "] ", c);
+      free (p1); free (p2_inner); free (p2); free (c);
     }
   else if (level & _XY_Log_Warn)
     {
       /* [app 警告]  [app warn] */
-      str = xy_strcat (6,
-        "[", xy_str_to_yellow (prompt1), " ", xy_str_to_bold (xy_str_to_yellow (prompt2)), "] ", xy_str_to_yellow (content));
+      char *p1       = xy_str_to_yellow (prompt1);
+      char *p2_inner = xy_str_to_yellow (prompt2);
+      char *p2       = xy_str_to_bold (p2_inner);
+      char *c        = xy_str_to_yellow (content);
+      str = xy_strcat (6, "[", p1, " ", p2, "] ", c);
+      free (p1); free (p2_inner); free (p2); free (c);
       to_stderr = true;
     }
   else if (level & _XY_Log_Error)
     {
       /* [app 错误]  [app error] */
-      str = xy_strcat (6,
-        "[", xy_str_to_red (prompt1), " ", xy_str_to_bold (xy_str_to_red (prompt2)), "] ", xy_str_to_red (content));
+      char *p1       = xy_str_to_red (prompt1);
+      char *p2_inner = xy_str_to_red (prompt2);
+      char *p2       = xy_str_to_bold (p2_inner);
+      char *c        = xy_str_to_red (content);
+      str = xy_strcat (6, "[", p1, " ", p2, "] ", c);
+      free (p1); free (p2_inner); free (p2); free (c);
       to_stderr = true;
     }
   else
@@ -969,6 +999,7 @@ xy_run_iter_lines (const char *cmd,  unsigned long n,  bool (*func) (const char
   if (stream == NULL)
     {
       _xy_internal_warn ("xy_run_iter_lines(): popen() failed");
+      free (buf);
       return NULL;
     }
 
@@ -980,6 +1011,8 @@ xy_run_iter_lines (const char *cmd,  unsigned long n,  bool (*func) (const char
       if (NULL == fgets (buf, size, stream))
         break;
       /* 存在换行的总是会把换行符读出来，删掉 */
+      if (ret)
+        free (ret);
       ret = xy_str_delete_suffix (buf, "\n");
       count += 1;
       if (n == count)
@@ -991,6 +1024,7 @@ xy_run_iter_lines (const char *cmd,  unsigned long n,  bool (*func) (const char
         }
     }
 
+  free (buf);
   pclose (stream);
   return ret;
 }
@@ -1018,6 +1052,7 @@ xy_run_get_status (char *cmd)
   char * command = xy_quiet_cmd (cmd);
 
   int status = system (command);
+  free (command);
   return status;
 }
 
@@ -1041,6 +1076,7 @@ xy_run_get_stdout (const char *cmd, char **output)
   if (stream == NULL)
     {
       _xy_internal_warn ("xy_run_get_stdout(): popen() failed");
+      free (buf);
       return -1;
     }
 
@@ -1052,6 +1088,14 @@ xy_run_get_stdout (const char *cmd, char **output)
       {
         cap *= 2;
         char *new_buf = realloc (buf, cap);
+        if (NULL == new_buf)
+          {
+            _xy_internal_warn ("xy_run_get_stdout(): No available memory to allocate!");
+            free (buf);
+            pclose (stream);
+            if (output) *output = NULL;
+            return -1;
+          }
         buf = new_buf;
       }
     }
@@ -1061,6 +1105,8 @@ xy_run_get_stdout (const char *cmd, char **output)
 
   if (output)
     *output = buf;
+  else
+    free (buf);
 
     return status;
 }
@@ -1299,7 +1345,8 @@ xy_parent_dir (const char *path)
   if (!last)
     {
       /* 路径中没有一个 / 是很奇怪的，我们直接返回 . 作为当前目录 */
-      return ".";
+      free (dir);
+      return xy_strdup (".");
     }
   *last = '\0';
 

test/xy.c

@@ -145,6 +145,7 @@ main (int argc, char const *argv[])
 
   println (xy_normalize_path (" \n ~/haha/test/123 \n\r "));
   assert_str (xy_normalize_path ("~/haha/test"), xy_parent_dir (" ~/haha/test/123"));
+  assert_str (".", xy_parent_dir ("abc"));