opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check and handle ntfs_inode_close() return value

master
szaka 2007-06-05 00:14:06 +00:00
parent 7b02774d67
commit a5ee2e2039
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libntfs-3g/dir.c
View File

@ -485,7 +485,10 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_volume *vol, ntfs_inode *parent,
} }
if (ni != parent) if (ni != parent)
ntfs_inode_close(ni); if (ntfs_inode_close(ni)) {
err = errno;
goto out;
}
inum = MREF(inum); inum = MREF(inum);
ni = ntfs_inode_open(vol, inum); ni = ntfs_inode_open(vol, inum);
@ -505,7 +508,9 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_volume *vol, ntfs_inode *parent,
ni = NULL; ni = NULL;
close: close:
if (ni && (ni != parent)) if (ni && (ni != parent))
ntfs_inode_close(ni); if (ntfs_inode_close(ni) && !err)
err = errno;
out:
free(ascii); free(ascii);
free(unicode); free(unicode);
if (err) if (err)
@ -1531,8 +1536,8 @@ out:
ntfs_attr_put_search_ctx(actx); ntfs_attr_put_search_ctx(actx);
if (ictx) if (ictx)
ntfs_index_ctx_put(ictx); ntfs_index_ctx_put(ictx);
if (ni) if (ni && ntfs_inode_close(ni) && !err)
ntfs_inode_close(ni); err = errno;
if (err) { if (err) {
errno = err; errno = err;
ntfs_log_debug("Could not delete file: %s\n", strerror(errno)); ntfs_log_debug("Could not delete file: %s\n", strerror(errno));