TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-09-07 22:31:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #290 from giuseppe/fix-fd-leak

Browse Source 
main, rename: fix leak on error
This commit is contained in:
Daniel J Walsh 2021-04-17 06:09:11 -04:00 committed by GitHub
commit b2a8df7ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.c
View File

@ -4426,8 +4426,8 @@ ovl_rename_direct (fuse_req_t req, fuse_ino_t parent, const char *name,
struct ovl_data *lo = ovl_data (req); struct ovl_data *lo = ovl_data (req);
int ret; int ret;
int saved_errno; int saved_errno;
int srcfd = -1; cleanup_close int srcfd = -1;
int destfd = -1; cleanup_close int destfd = -1;
struct ovl_node key; struct ovl_node key;
bool destnode_is_whiteout = false; bool destnode_is_whiteout = false;
@ -4612,20 +4612,12 @@ ovl_rename_direct (fuse_req_t req, fuse_ino_t parent, const char *name,
node->loaded = 0; node->loaded = 0;
ret = 0; ret = 0;
goto cleanup; fuse_reply_err (req, 0);
return;
error: error:
ret = -1; ret = -1;
fuse_reply_err (req, errno);
cleanup:
saved_errno = errno;
if (srcfd >= 0)
close (srcfd);
if (destfd >= 0)
close (destfd);
errno = saved_errno;
fuse_reply_err (req, ret == 0 ? 0 : errno);
} }
static void static void