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

Fixed a bug which crashed the BResource tests (sorry Ingo)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1428 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2002-10-07 10:09:39 +00:00
parent b8f9ee8199
commit fde69fce63
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/DataIO.cpp
+8 -10
View File
@@ -395,25 +395,23 @@ BMallocIO::SetSize(off_t size)
// 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 = (size + fBlockSize - 1) / fBlockSize * fBlockSize;
if (newSize != fMallocSize) { if (size != fMallocSize) {
// we need to resize // we need to resize
if (char *newData = static_cast<char*>(realloc(fData, newSize))) { if (char *newData = static_cast<char*>(realloc(fData, size))) {
// set the new area to 0 // set the new area to 0
if (newSize > fMallocSize) if (size > fMallocSize)
memset(newData + fMallocSize, 0, newSize - fMallocSize); memset(newData + fMallocSize, 0, size - fMallocSize);
if (fLength > newSize)
fLength = newSize;
fData = newData; fData = newData;
fMallocSize = newSize; fMallocSize = size;
} else // couldn't alloc the memory } else // couldn't alloc the memory
error = B_NO_MEMORY; error = B_NO_MEMORY;
} }
} }
if (error == B_OK)
fLength = size;
return error; return error;
} }