improve call path_build

Author: xianjimli

docs/changes.md

@@ -1,5 +1,8 @@
 # 最新动态
 
+2025/08/21
+  * 添加对path相关函数返回值的处理，避免诸如路径过长导致死循环的问题(感谢朝泽提供补丁)
+
 2025/08/20
   * 修复demouiold崩溃问题(感谢兆坤提供补丁)
   * 修复list_view中的item使用self_layout时布局异常的问题(感谢俊杰提供补丁)

src/base/assets_manager.c

@@ -1027,18 +1027,22 @@ assets_manager_t* assets_managers_ref(const char* name) {
     uint32_t i = 0;
     const char* iter = NULL;
     char res_root[MAX_PATH + 1] = {0};
-    am = assets_manager_create(5);
-    return_value_if_fail(am != NULL, NULL);
+    bool_t applet_res_root_found = FALSE;
+    return_value_if_fail(assets_managers_is_applet_assets_supported(), NULL);
 
-    if (s_applet_res_roots != NULL) {
-      for (i = 0; i < s_applet_res_roots->size; i++) {
-        iter = (const char*)darray_get(s_applet_res_roots, i);
-        path_build(res_root, MAX_PATH, iter, name, NULL);
+    for (i = 0; i < s_applet_res_roots->size; i++) {
+      iter = (const char*)darray_get(s_applet_res_roots, i);
+      if (path_build(res_root, MAX_PATH, iter, name, NULL) == RET_OK) {
         if (fs_dir_exist(os_fs(), res_root)) {
+          applet_res_root_found = TRUE;
           break;
         }
       }
     }
+    return_value_if_fail(applet_res_root_found, NULL);
+
+    am = assets_manager_create(5);
+    return_value_if_fail(am != NULL, NULL);
     am->name = tk_strdup(name);
     darray_push(s_assets_managers, am);
     assets_manager_set_res_root(am, res_root);

src/conf_io/app_conf_init.c

@@ -43,13 +43,13 @@ static ret_t app_conf_get_url(char url[MAX_PATH + 1], const char* app_name, cons
     return_value_if_fail(fs_create_dir(fs, path) == RET_OK, RET_FAIL);
   }
 
-  path_build(app_dir, MAX_PATH, path, app_name, NULL);
+  return_value_if_fail(path_build(app_dir, MAX_PATH, path, app_name, NULL) == RET_OK, RET_FAIL);
   if (!path_exist(app_dir)) {
     return_value_if_fail(fs_create_dir(fs, app_dir) == RET_OK, RET_FAIL);
   }
 
   tk_snprintf(url, MAX_PATH, "app_conf.%s", extname);
-  path_build(path, MAX_PATH, app_dir, url, NULL);
+  return_value_if_fail(path_build(path, MAX_PATH, app_dir, url, NULL) == RET_OK, RET_FAIL);
   tk_snprintf(url, MAX_PATH, "file://%s", path);
 
   return RET_OK;

src/tkc/fs.c

@@ -575,7 +575,7 @@ ret_t fs_remove_dir_r(fs_t* fs, const char* name) {
       continue;
     } else {
       char subname[MAX_PATH + 1];
-      path_build(subname, MAX_PATH, name, item.name, NULL);
+      break_if_fail(path_build(subname, MAX_PATH, name, item.name, NULL));
       if (item.is_dir) {
         ret = fs_remove_dir_r(fs, subname);
       } else {
@@ -717,8 +717,10 @@ static ret_t fs_copy_item(fs_t* fs, fs_item_t* item, const char* src, const char
                           bool_t overwrite) {
   char subsrc[MAX_PATH + 1];
   char subdst[MAX_PATH + 1];
-  path_build(subsrc, MAX_PATH, src, item->name, NULL);
-  path_build(subdst, MAX_PATH, dst, item->name, NULL);
+  return_value_if_fail(path_build(subsrc, MAX_PATH, src, item->name, NULL) == RET_OK,
+                       RET_BAD_PARAMS);
+  return_value_if_fail(path_build(subdst, MAX_PATH, dst, item->name, NULL) == RET_OK,
+                       RET_BAD_PARAMS);
 
   if (!fs_dir_exist(fs, dst)) {
     return_value_if_fail(fs_create_dir_r(fs, dst) == RET_OK, RET_IO);
@@ -794,7 +796,8 @@ ret_t fs_foreach(const char* path, int depth, tk_visit_t on_file, tk_visit_t on_
       continue;
     }
 
-    path_build(filename, MAX_PATH, path, item.name, NULL);
+    break_if_fail(path_build(filename, MAX_PATH, path, item.name, NULL) == RET_OK);
+
     if (item.is_reg_file) {
       if (on_file != NULL && on_file(ctx, filename) != RET_OK) {
         break;

src/tkc/path.c

@@ -151,7 +151,7 @@ ret_t path_app_root(char path[MAX_PATH + 1]) {
   memset(exe_path, 0x00, sizeof(exe_path));
 
   if (fs_get_exe(os_fs(), exe_path) == RET_OK) {
-    path_normalize(exe_path, path, MAX_PATH + 1);
+    return_value_if_fail(path_normalize(exe_path, path, MAX_PATH + 1) == RET_OK, RET_FAIL);
     p = strrchr(path, TK_PATH_SEP);
     if (p != NULL) {
       *p = '\0';
@@ -308,8 +308,8 @@ ret_t path_replace_basename(char* result, int32_t size, const char* filename,
   char dirname[MAX_PATH + 1];
   return_value_if_fail(result != NULL && filename != NULL && basename != NULL, RET_BAD_PARAMS);
 
-  path_normalize(filename, result, size);
-  path_dirname(result, dirname, MAX_PATH);
+  return_value_if_fail(path_normalize(filename, result, size) == RET_OK, RET_FAIL);
+  return_value_if_fail(path_dirname(result, dirname, MAX_PATH) == RET_OK, RET_FAIL);
 
   dirname[MAX_PATH] = '\0';
   return path_build(result, size, dirname, basename, NULL);
@@ -320,7 +320,7 @@ ret_t path_replace_extname(char* result, int32_t size, const char* filename, con
   return_value_if_fail(result != NULL && filename != NULL && extname != NULL, RET_BAD_PARAMS);
 
   memset(result, 0x00, size);
-  path_normalize(filename, result, size);
+  return_value_if_fail(path_normalize(filename, result, size) == RET_OK, RET_FAIL);
   p = strrchr(result, '.');
   if (p != NULL) {
     uint32_t n = 0;
@@ -354,17 +354,15 @@ ret_t path_app_root_ex(char path[MAX_PATH + 1], const char* subpath) {
   char app_root[MAX_PATH + 1] = {0};
   return_value_if_fail(path_app_root(app_root) == RET_OK, RET_BAD_PARAMS);
 
-  path_build(path, MAX_PATH, app_root, subpath, NULL);
-
-  return RET_OK;
+  return path_build(path, MAX_PATH, app_root, subpath, NULL);
 }
 
 const char* path_prepend_app_root(char full_path[MAX_PATH + 1], const char* path) {
   char app_root[MAX_PATH + 1] = {0};
   return_value_if_fail(path != NULL, NULL);
   return_value_if_fail(path_app_root(app_root) == RET_OK, NULL);
 
-  path_build(full_path, MAX_PATH, app_root, path, NULL);
+  return_value_if_fail(path_build(full_path, MAX_PATH, app_root, path, NULL) == RET_OK, NULL);
 
   return full_path;
 }
@@ -374,7 +372,7 @@ const char* path_prepend_temp_path(char full_path[MAX_PATH + 1], const char* pat
   return_value_if_fail(path != NULL, NULL);
   return_value_if_fail(fs_get_temp_path(os_fs(), temp_path) == RET_OK, NULL);
 
-  path_build(full_path, MAX_PATH, temp_path, path, NULL);
+  return_value_if_fail(path_build(full_path, MAX_PATH, temp_path, path, NULL) == RET_OK, NULL);
 
   return full_path;
 }
@@ -384,7 +382,8 @@ const char* path_prepend_user_storage_path(char full_path[MAX_PATH + 1], const c
   return_value_if_fail(path != NULL, NULL);
   return_value_if_fail(fs_get_user_storage_path(os_fs(), user_storage_path) == RET_OK, NULL);
 
-  path_build(full_path, MAX_PATH, user_storage_path, path, NULL);
+  return_value_if_fail(path_build(full_path, MAX_PATH, user_storage_path, path, NULL) == RET_OK,
+                       NULL);
 
   return full_path;
 }
@@ -393,7 +392,7 @@ ret_t path_abs_normalize(const char* filename, char* result, int32_t size) {
   char path[MAX_PATH + 1];
   return_value_if_fail(filename != NULL && result != NULL && size > 0, RET_BAD_PARAMS);
 
-  path_abs(filename, path, MAX_PATH);
+  return_value_if_fail(path_abs(filename, path, MAX_PATH) == RET_OK, RET_FAIL);
   return path_normalize(path, result, size);
 }
 
@@ -403,10 +402,10 @@ const char* path_abs_normalize_with_root(const char* root, const char* rel_filen
   char abs_root[MAX_PATH + 1];
   return_value_if_fail(root != NULL && rel_filename != NULL, NULL);
 
-  path_abs_normalize(root, abs_root, MAX_PATH);
+  return_value_if_fail(path_abs_normalize(root, abs_root, MAX_PATH) == RET_OK, NULL);
 
-  path_build(path, MAX_PATH, abs_root, rel_filename, NULL);
-  path_normalize(path, filename, MAX_PATH);
+  return_value_if_fail(path_build(path, MAX_PATH, abs_root, rel_filename, NULL) == RET_OK, NULL);
+  return_value_if_fail(path_normalize(path, filename, MAX_PATH) == RET_OK, NULL);
 
   if (strncmp(filename, abs_root, strlen(abs_root)) == 0) {
     return filename;