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

Added some argument bound checks in Replace() and SetViewOffset().

Browse Source 
Replace(), Insert(), and Remove() now locks the editor themselves.
ReplaceChange::Normalize() corrected the size for the right reason in a wrong way.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6741 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-02-26 01:59:42 +00:00
parent 35f497aa98
commit ee24db11e1
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apps/diskprobe/DataEditor.cpp
View File

@ -90,7 +90,7 @@ ReplaceChange::Normalize(off_t bufferOffset, size_t bufferSize, off_t &offset,
} }
if (offset + size > bufferOffset + bufferSize) if (offset + size > bufferOffset + bufferSize)
size = offset - bufferOffset + offset; size = bufferOffset + bufferSize - offset;
} }
@ -98,7 +98,7 @@ void
ReplaceChange::Apply(off_t bufferOffset, uint8 *buffer, size_t bufferSize) ReplaceChange::Apply(off_t bufferOffset, uint8 *buffer, size_t bufferSize)
{ {
// is it in our range? // is it in our range?
if (fOffset - bufferOffset > bufferSize || fOffset + fSize < bufferOffset) if (fOffset > bufferOffset + bufferSize || fOffset + fSize < bufferOffset)
return; return;
// don't change anything outside the supplied buffer // don't change anything outside the supplied buffer
@ -318,8 +318,12 @@ DataEditor::AddChange(DataChange *change)
status_t status_t
DataEditor::Replace(off_t offset, const uint8 *data, size_t length) DataEditor::Replace(off_t offset, const uint8 *data, size_t length)
{ {
if (!IsLocked()) BAutolock locker(this);
debugger("DataEditor: view not locked");
if (offset >= fSize)
return B_BAD_VALUE;
if (offset + length > fSize)
length = fSize - offset;
if (fNeedsUpdate) { if (fNeedsUpdate) {
status_t status = Update(); status_t status = Update();
@ -337,8 +341,7 @@ DataEditor::Replace(off_t offset, const uint8 *data, size_t length)
status_t status_t
DataEditor::Remove(off_t offset, off_t length) DataEditor::Remove(off_t offset, off_t length)
{ {
if (!IsLocked()) BAutolock locker(this);
debugger("DataEditor: view not locked");
// not yet implemented // not yet implemented
@ -349,8 +352,7 @@ DataEditor::Remove(off_t offset, off_t length)
status_t status_t
DataEditor::Insert(off_t offset, const uint8 *text, size_t length) DataEditor::Insert(off_t offset, const uint8 *text, size_t length)
{ {
if (!IsLocked()) BAutolock locker(this);
debugger("DataEditor: view not locked");
// not yet implemented // not yet implemented
@ -491,6 +493,9 @@ DataEditor::SetViewOffset(off_t offset)
return status; return status;
} }
if (offset < 0 || offset > fSize)
return B_BAD_VALUE;
fRealViewOffset = (offset / fBlockSize) * fBlockSize; fRealViewOffset = (offset / fBlockSize) * fBlockSize;
fViewOffset = offset; fViewOffset = offset;
fNeedsUpdate = true; fNeedsUpdate = true;