From a5ee2e20398b024312830f79d20af0c893b833da Mon Sep 17 00:00:00 2001 From: szaka Date: Tue, 5 Jun 2007 00:14:06 +0000 Subject: [PATCH] check and handle ntfs_inode_close() return value --- libntfs-3g/dir.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libntfs-3g/dir.c b/libntfs-3g/dir.c index 19f30139..eb00e381 100644 --- a/libntfs-3g/dir.c +++ b/libntfs-3g/dir.c @@ -485,7 +485,10 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_volume *vol, ntfs_inode *parent, } if (ni != parent) - ntfs_inode_close(ni); + if (ntfs_inode_close(ni)) { + err = errno; + goto out; + } inum = MREF(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; close: if (ni && (ni != parent)) - ntfs_inode_close(ni); + if (ntfs_inode_close(ni) && !err) + err = errno; +out: free(ascii); free(unicode); if (err) @@ -1531,8 +1536,8 @@ out: ntfs_attr_put_search_ctx(actx); if (ictx) ntfs_index_ctx_put(ictx); - if (ni) - ntfs_inode_close(ni); + if (ni && ntfs_inode_close(ni) && !err) + err = errno; if (err) { errno = err; ntfs_log_debug("Could not delete file: %s\n", strerror(errno));