[dfs]释放fd_slot之前将子节点释放避免内存泄漏 (#7378)

guoguozi123456 · web-flow · commit efbdeb25ee7f · 2023-04-26T08:47:21.000+08:00
diff --git a/components/dfs/dfs_v1/src/dfs.c b/components/dfs/dfs_v1/src/dfs.c
@@ -359,6 +359,11 @@ void fdt_fd_release(struct dfs_fdtable* fdt, int fd)
         if (vnode)
         {
             vnode->ref_count--;
+            if(vnode->ref_count == 0)
+            {
+                rt_free(vnode);
+                fd_slot->vnode = RT_NULL;
+            }
         }
         rt_free(fd_slot);
     }
diff --git a/components/dfs/dfs_v2/src/dfs.c b/components/dfs/dfs_v2/src/dfs.c
@@ -359,6 +359,11 @@ void fdt_fd_release(struct dfs_fdtable* fdt, int fd)
         if (vnode)
         {
             vnode->ref_count--;
+            if(vnode->ref_count == 0)
+            {
+                rt_free(vnode);
+                fd_slot->vnode = RT_NULL;
+            }
         }
         rt_free(fd_slot);
     }

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,11 @@ void fdt_fd_release(struct dfs_fdtable* fdt, int fd)`
`359`	`359`	`if (vnode)`
`360`	`360`	`{`
`361`	`361`	`vnode->ref_count--;`
	`362`	`+ if(vnode->ref_count == 0)`
	`363`	`+ {`
	`364`	`+ rt_free(vnode);`
	`365`	`+ fd_slot->vnode = RT_NULL;`
	`366`	`+ }`
`362`	`367`	`}`
`363`	`368`	`rt_free(fd_slot);`
`364`	`369`	`}`