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

More bugs fixed.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1210 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2002-09-27 16:28:11 +00:00
parent b1594ca363
commit 3e8f4f3d29
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/DataIO.cpp
+11 -7
View File
@@ -198,7 +198,7 @@ BMemoryIO::ReadAt(off_t pos, void *buffer, size_t size)
return B_BAD_VALUE; return B_BAD_VALUE;
ssize_t sizeRead = 0; ssize_t sizeRead = 0;
if (pos >= 0 && pos < fLen) { if (pos < fLen) {
sizeRead = min(static_cast<off_t>(size), fLen - pos); sizeRead = min(static_cast<off_t>(size), fLen - pos);
memcpy(buffer, fBuf + pos, sizeRead); memcpy(buffer, fBuf + pos, sizeRead);
} }
@@ -217,7 +217,7 @@ BMemoryIO::WriteAt(off_t pos, const void *buffer, size_t size)
return B_BAD_VALUE; return B_BAD_VALUE;
ssize_t sizeWritten = 0; ssize_t sizeWritten = 0;
if (pos >= 0 && pos < fPhys) { if (pos < fPhys) {
sizeWritten = min(static_cast<off_t>(size), fPhys - pos); sizeWritten = min(static_cast<off_t>(size), fPhys - pos);
memcpy(fBuf + pos, buffer, sizeWritten); memcpy(fBuf + pos, buffer, sizeWritten);
} }
@@ -262,11 +262,12 @@ BMemoryIO::Position() const
status_t status_t
BMemoryIO::SetSize(off_t size) BMemoryIO::SetSize(off_t size)
{ {
status_t err = B_ERROR;
if (fReadOnly) if (fReadOnly)
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
status_t err = B_ERROR; if (size <= fPhys) {
if (size >= 0 && size <= fPhys) {
err = B_OK; err = B_OK;
fLen = size; fLen = size;
} }
@@ -324,7 +325,7 @@ BMallocIO::ReadAt(off_t pos, void *buffer, size_t size)
return B_BAD_VALUE; return B_BAD_VALUE;
ssize_t sizeRead = 0; ssize_t sizeRead = 0;
if (pos >= 0 && pos < fLength) { if (pos < fLength) {
sizeRead = min(static_cast<off_t>(size), fLength - pos); sizeRead = min(static_cast<off_t>(size), fLength - pos);
memcpy(buffer, fData + pos, sizeRead); memcpy(buffer, fData + pos, sizeRead);
} }
@@ -342,7 +343,7 @@ BMallocIO::WriteAt(off_t pos, const void *buffer, size_t size)
size_t newSize = max(pos + size, static_cast<off_t>(fLength)); size_t newSize = max(pos + size, static_cast<off_t>(fLength));
status_t error = B_OK; status_t error = B_OK;
if (newSize > fMallocSize) if (newSize > fMallocSize)
error = SetSize(newSize); error = SetSize(newSize);
@@ -390,10 +391,11 @@ status_t
BMallocIO::SetSize(off_t size) BMallocIO::SetSize(off_t size)
{ {
status_t error = B_OK; status_t error = B_OK;
if (size <= 0) { if (size == 0) {
// size == 0, free the memory // size == 0, free the memory
free(fData); free(fData);
fData = NULL; fData = NULL;
fLength = 0;
} else { } else {
// size != 0, see, if necessary to resize // size != 0, see, if necessary to resize
size_t newSize = (size + fBlockSize - 1) / fBlockSize * fBlockSize; size_t newSize = (size + fBlockSize - 1) / fBlockSize * fBlockSize;
@@ -403,6 +405,8 @@ BMallocIO::SetSize(off_t size)
// set the new area to 0 // set the new area to 0
if (newSize > fMallocSize) if (newSize > fMallocSize)
memset(newData + fMallocSize, 0, newSize - fMallocSize); memset(newData + fMallocSize, 0, newSize - fMallocSize);
if (fLength > newSize)
fLength = newSize;
fData = newData; fData = newData;
fMallocSize = newSize; fMallocSize = newSize;
} else // couldn't alloc the memory } else // couldn't alloc the memory