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

Fixed crashing bug related to incorrect bounds checking

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8669 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
haydentech 2004-08-26 20:29:03 +00:00
parent 40cce32835
commit 54b32ef066
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/servers/app/server/BitmapDriver.cpp
View File

@ -815,23 +815,9 @@ void BitmapDriver::CopyBitmap(ServerBitmap *bitmap, const BRect &sourcerect, con
// Second, check rectangle bounds against their own bitmaps
BRect work_rect(_target->Bounds());
BRect work_rect(bitmap->Bounds());
if( !(work_rect.Contains(destrect)) )
{
// something in selection must be clipped
if(destrect.left < 0)
destrect.left = 0;
if(destrect.right > work_rect.right)
destrect.right = work_rect.right;
if(destrect.top < 0)
destrect.top = 0;
if(destrect.bottom > work_rect.bottom)
destrect.bottom = work_rect.bottom;
}
work_rect.Set(0,0,_displaymode.virtual_width-1,_displaymode.virtual_height-1);
// Is there anything at all to copy?
if(!work_rect.Contains(sourcerect))
return;
@ -847,6 +833,21 @@ void BitmapDriver::CopyBitmap(ServerBitmap *bitmap, const BRect &sourcerect, con
if(source.bottom > work_rect.bottom)
source.bottom = work_rect.bottom;
}
work_rect.Set(0,0,_displaymode.virtual_width-1,_displaymode.virtual_height-1);
if( !(work_rect.Contains(destrect)) )
{
// something in selection must be clipped
if(destrect.left < 0)
destrect.left = 0;
if(destrect.right > work_rect.right)
destrect.right = work_rect.right;
if(destrect.top < 0)
destrect.top = 0;
if(destrect.bottom > work_rect.bottom)
destrect.bottom = work_rect.bottom;
}
// Set pointers to the actual data
uint8 *dest_bits = (uint8*) _target->Bits();
@ -862,7 +863,7 @@ void BitmapDriver::CopyBitmap(ServerBitmap *bitmap, const BRect &sourcerect, con
uint32 line_length = uint32 ((destrect.right - destrect.left+1)*colorspace_size);
uint32 lines = uint32 (source.bottom-source.top+1);
uint32 lines = uint32 (destrect.bottom-destrect.top+1);
for (uint32 pos_y=0; pos_y<lines; pos_y++)
{
@ -924,6 +925,7 @@ void BitmapDriver::CopyToBitmap(ServerBitmap *destbmp, const BRect &sourcerect)
work_rect.Set(0,0,_displaymode.virtual_width-1,_displaymode.virtual_height-1);
// Is there anything at all to copy?
if(!work_rect.Contains(sourcerect))
return;