jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue in write_unaligned when writing to a file it's too short

Browse Source
This commit is contained in:
Arvid Norberg
2011-10-11 08:43:15 +00:00
parent e1bfd8541f
commit e6324670a1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/storage.cpp
View File

@@ -1342,14 +1342,20 @@ ret:
? ((size+start_adjust) & ~size_align) + size_align + 1 : size + start_adjust; ? ((size+start_adjust) & ~size_align) + size_align + 1 : size + start_adjust;
TORRENT_ASSERT((aligned_size & size_align) == 0); TORRENT_ASSERT((aligned_size & size_align) == 0);
size_type actual_file_size = file_handle->get_size(ec);
if (ec) return -1;
// allocate a temporary, aligned, buffer // allocate a temporary, aligned, buffer
aligned_holder aligned_buf(aligned_size); aligned_holder aligned_buf(aligned_size);
file::iovec_t b = {aligned_buf.get(), aligned_size}; file::iovec_t b = {aligned_buf.get(), aligned_size};
size_type ret = file_handle->readv(aligned_start, &b, 1, ec); if (aligned_start < actual_file_size) // we have something to read
if (ret < 0)
{ {
TORRENT_ASSERT(ec); size_type ret = file_handle->readv(aligned_start, &b, 1, ec);
return ret; if (ret < 0)
{
TORRENT_ASSERT(ec);
return ret;
}
} }
// OK, we read the portion of the file. Now, overlay the buffer we're writing // OK, we read the portion of the file. Now, overlay the buffer we're writing
@@ -1362,7 +1368,7 @@ ret:
} }
// write the buffer back to disk // write the buffer back to disk
ret = file_handle->writev(aligned_start, &b, 1, ec); size_type ret = file_handle->writev(aligned_start, &b, 1, ec);
if (ret < 0) if (ret < 0)
{ {