i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Don't store a possibly negative return value in an unsigned size_t, which

Browse Source 
is later used as parameter to memcpy(). Should fix r5623 (untested).
 * Fixed coding style for some comments.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35944 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-03-24 16:48:33 +00:00
parent 2b355ea6fc
commit 1e16c00279
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/BufferIO.cpp
+14 -6
View File
@@ -73,14 +73,21 @@ BBufferIO::ReadAt(off_t pos, void* buffer, size_t size)
|| pos < fBufferStart || pos < fBufferStart
|| pos > fBufferStart + fBufferUsed || pos > fBufferStart + fBufferUsed
|| pos + size > fBufferStart + fBufferUsed) { || pos + size > fBufferStart + fBufferUsed) {
if (fBufferIsDirty) if (fBufferIsDirty) {
Flush(); // If there are pending writes, do them. // If there are pending writes, do them.
Flush();
}
// ...cache as much as we can from the stream // ...cache as much as we can from the stream
fBufferUsed = fStream->ReadAt(pos, fBuffer, fBufferSize); ssize_t sizeRead = fStream->ReadAt(pos, fBuffer, fBufferSize);
if (sizeRead < 0)
return sizeRead;
if (fBufferUsed > 0) fBufferUsed = sizeRead;
fBufferStart = pos; // The data is buffered starting from this offset if (fBufferUsed > 0) {
// The data is buffered starting from this offset
fBufferStart = pos;
}
} }
size = min_c(size, fBufferUsed); size = min_c(size, fBufferUsed);
@@ -117,7 +124,8 @@ BBufferIO::WriteAt(off_t pos, const void* buffer, size_t size)
ssize_t read; ssize_t read;
off_t where = pos; off_t where = pos;
if (pos + size <= fBufferSize) // Can we just cache from the beginning ? // Can we just cache from the beginning?
if (pos + size <= fBufferSize)
where = 0; where = 0;
// ...cache more. // ...cache more.