wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

another storage fix

This commit is contained in:
Arvid Norberg 2009-01-13 08:58:35 +00:00
parent 3f0fa60164
commit 0bb330225c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage.cpp
View File

@ -370,7 +370,7 @@ namespace libtorrent
for (;;) for (;;)
{ {
size += bufs->iov_len; size += bufs->iov_len;
if (size > bytes) if (size >= bytes)
{ {
((char*&)bufs->iov_base) += bufs->iov_len - (size - bytes); ((char*&)bufs->iov_base) += bufs->iov_len - (size - bytes);
bufs->iov_len = size - bytes; bufs->iov_len = size - bytes;
@ -1231,6 +1231,7 @@ ret:
file::iovec_t* tmp_bufs = TORRENT_ALLOCA(file::iovec_t, num_bufs); file::iovec_t* tmp_bufs = TORRENT_ALLOCA(file::iovec_t, num_bufs);
file::iovec_t* current_buf = TORRENT_ALLOCA(file::iovec_t, num_bufs); file::iovec_t* current_buf = TORRENT_ALLOCA(file::iovec_t, num_bufs);
copy_bufs(bufs, size, current_buf); copy_bufs(bufs, size, current_buf);
TORRENT_ASSERT(count_bufs(current_buf, size) == num_bufs);
int write_bytes; int write_bytes;
for (;left_to_write > 0; ++file_iter, left_to_write -= write_bytes for (;left_to_write > 0; ++file_iter, left_to_write -= write_bytes
, buf_pos += write_bytes) , buf_pos += write_bytes)
@ -1255,9 +1256,8 @@ ret:
if (file_iter->pad_file) if (file_iter->pad_file)
{ {
int actual_written = (std::min)(int(file_iter->size), left_to_write); advance_bufs(current_buf, write_bytes);
advance_bufs(current_buf, actual_written); TORRENT_ASSERT(count_bufs(current_buf, left_to_write - write_bytes) <= num_bufs);
left_to_write -= actual_written;
continue; continue;
} }
@ -1277,6 +1277,7 @@ ret:
} }
int num_tmp_bufs = copy_bufs(current_buf, write_bytes, tmp_bufs); int num_tmp_bufs = copy_bufs(current_buf, write_bytes, tmp_bufs);
TORRENT_ASSERT(count_bufs(tmp_bufs, write_bytes) == num_tmp_bufs);
int actual_written = int(out->writev(file_iter->file_base int actual_written = int(out->writev(file_iter->file_base
+ file_offset, tmp_bufs, num_tmp_bufs, ec)); + file_offset, tmp_bufs, num_tmp_bufs, ec));