Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed errors that allowed allocating past end of partition.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6178 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Tyler Dauwalder 2004-01-20 05:37:31 +00:00
parent 6253d5d5f8
commit 22e65146c6
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/apps/bin/makeudfimage/Allocator.cpp
View File

@ -102,8 +102,9 @@ Allocator::GetExtent(Udf::extent_address extent)
return B_OK;
}
}
}
// No matching chunk found, we're SOL.
error = B_ERROR;
}
}
return error;
}
@ -212,23 +213,26 @@ Allocator::GetNextExtent(uint32 _length, bool contiguous,
}
}
// No sufficient chunk found, so try to allocate from the tail
uint32 maxLength = LONG_MAX-Length();
if (minimumStartingBlock > Tail())
maxLength -= minimumStartingBlock - Tail();
uint32 tail = minimumStartingBlock > Tail() ? minimumStartingBlock : Tail();
if (length > maxLength) {
if (contiguous)
error = B_DEVICE_FULL;
else {
isPartial = true;
length = maxLength;
}
}
uint32 maxLength = BlocksFor(ULONG_MAX)-Length();
error = maxLength > 0 ? B_OK : B_DEVICE_FULL;
if (!error) {
Udf::extent_address newExtent(tail, isPartial ? length<<BlockShift() : _length);
if (GetExtent(newExtent) == B_OK) {
extent = newExtent;
return B_OK;
if (minimumStartingBlock > Tail())
maxLength -= minimumStartingBlock - Tail();
uint32 tail = minimumStartingBlock > Tail() ? minimumStartingBlock : Tail();
if (length > maxLength) {
if (contiguous)
error = B_DEVICE_FULL;
else {
isPartial = true;
length = maxLength;
}
}
if (!error) {
Udf::extent_address newExtent(tail, isPartial ? length<<BlockShift() : _length);
if (GetExtent(newExtent) == B_OK) {
extent = newExtent;
return B_OK;
}
}
}
}