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

fixed a bad error checking when closing a compressed file

PERMISSION_HANDLING_BRANCH
Jean-Pierre André 2010-04-19 11:03:30 +02:00
parent 81eb764163
commit 9438188703
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libntfs-3g/attrib.c
View File

@ -1774,7 +1774,8 @@ errno_set:
int ntfs_attr_pclose(ntfs_attr *na) int ntfs_attr_pclose(ntfs_attr *na)
{ {
s64 written, ofs; s64 ofs;
int failed;
BOOL ok = TRUE; BOOL ok = TRUE;
VCN update_from = -1; VCN update_from = -1;
ntfs_volume *vol; ntfs_volume *vol;
@ -1895,9 +1896,9 @@ int ntfs_attr_pclose(ntfs_attr *na)
} }
retry: retry:
written = 0; failed = 0;
if (!NVolReadOnly(vol)) { if (!NVolReadOnly(vol)) {
written = ntfs_compressed_close(na, rl, ofs); failed = ntfs_compressed_close(na, rl, ofs);
#if CACHE_NIDATA_SIZE #if CACHE_NIDATA_SIZE
if (na->ni->mrec->flags & MFT_RECORD_IS_DIRECTORY if (na->ni->mrec->flags & MFT_RECORD_IS_DIRECTORY
? na->type == AT_INDEX_ROOT && na->name == NTFS_INDEX_I30 ? na->type == AT_INDEX_ROOT && na->name == NTFS_INDEX_I30
@ -1907,18 +1908,14 @@ retry:
set_nino_flag(na->ni,KnownSize); set_nino_flag(na->ni,KnownSize);
} }
#endif #endif
/* If everything ok, update progress counters and continue. */
if (!written)
goto done;
} }
if (failed) {
/* If the syscall was interrupted, try again. */ /* If the syscall was interrupted, try again. */
if (written == (s64)-1 && errno == EINTR) if (errno == EINTR)
goto retry; goto retry;
if (!written) else
errno = EIO; goto rl_err_out;
goto rl_err_out; }
done:
if (ctx) if (ctx)
ntfs_attr_put_search_ctx(ctx); ntfs_attr_put_search_ctx(ctx);
/* Update mapping pairs if needed. */ /* Update mapping pairs if needed. */