mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-11-23 10:04:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a sanity check when closing a compressed file

Browse Source
This commit is contained in:
Jean-Pierre André 2010-07-22 14:37:01 +02:00
parent 114e795611
commit 49ab780739
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libntfs-3g/attrib.c
View File

@ -2127,7 +2127,15 @@ int ntfs_attr_pclose(ntfs_attr *na)
if (!compressed || !NAttrNonResident(na))
goto out;
NAttrSetComprClosing(na); /* for safety checks */
/* safety check : no recursion on close */
if (NAttrComprClosing(na)) {
errno = EIO;
ntfs_log_error("Bad ntfs_attr_pclose"
" recursion on inode %lld\n",
(long long)na->ni->mft_no);
goto out;
}
NAttrSetComprClosing(na);
/*
* For a compressed attribute, we must be sure there are two
* available entries, so reserve them before it gets too late.
@ -4801,15 +4809,8 @@ static int ntfs_resident_attr_resize_i(ntfs_attr *na, const s64 newsize)
}
if (((tna->data_flags & ATTR_COMPRESSION_MASK)
== ATTR_IS_COMPRESSED)
&& (NAttrComprClosing(tna) || ntfs_attr_pclose(tna))) {
/* safety check : no recursion on close */
if (NAttrComprClosing(tna)) {
err = EIO;
ntfs_log_error("Bad ntfs_attr_pclose"
" recursion on inode %lld\n",
(long long)tna->ni->mft_no);
} else
err = errno;
&& ntfs_attr_pclose(tna)) {
err = errno;
ntfs_attr_close(tna);
goto put_err_out;
}