ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 04:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VGA]

Browse Source 
Fix possible NULL pointer dereference.
Patch by numitus (domovoi94 at gmail dot com)

svn path=/trunk/; revision=57058
This commit is contained in:
Timo Kreuzer
2012-08-11 22:40:50 +00:00
parent 0015122a38
commit abbb3c6a5a
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/win32ss/drivers/displays/vga/objects/bitblt.c
+19 -7
View File
@@ -426,6 +426,18 @@ DrvBitBlt(
UINT i;
POINTL Pt;
ULONG Direction;
POINTL FinalSourcePoint;
if (Source && SourcePoint)
{
FinalSourcePoint.x = SourcePoint->x;
FinalSourcePoint.y = SourcePoint->y;
}
else
{
FinalSourcePoint.x = 0;
FinalSourcePoint.y = 0;
}
switch (rop4)
{
@@ -462,8 +474,8 @@ DrvBitBlt(
case DC_RECT:
/* Clip the blt to the clip rectangle */
VGADDI_IntersectRect(&CombinedRect, DestRect, &(Clip->rclBounds));
Pt.x = SourcePoint->x + CombinedRect.left - DestRect->left;
Pt.y = SourcePoint->y + CombinedRect.top - DestRect->top;
Pt.x = FinalSourcePoint.x + CombinedRect.left - DestRect->left;
Pt.y = FinalSourcePoint.y + CombinedRect.top - DestRect->top;
Ret = (*BltRectFunc)(Dest, Source, Mask, ColorTranslation, &CombinedRect,
&Pt, MaskPoint, Brush, BrushPoint,
rop4);
@@ -472,10 +484,10 @@ DrvBitBlt(
Ret = TRUE;
if (Dest == Source)
{
if (DestRect->top <= SourcePoint->y)
Direction = DestRect->left < SourcePoint->x ? CD_RIGHTDOWN : CD_LEFTDOWN;
if (DestRect->top <= FinalSourcePoint.y)
Direction = DestRect->left < FinalSourcePoint.y ? CD_RIGHTDOWN : CD_LEFTDOWN;
else
Direction = DestRect->left < SourcePoint->x ? CD_RIGHTUP : CD_LEFTUP;
Direction = DestRect->left < FinalSourcePoint.x ? CD_RIGHTUP : CD_LEFTUP;
}
else
{
@@ -489,8 +501,8 @@ DrvBitBlt(
for (i = 0; i < RectEnum.c; i++)
{
VGADDI_IntersectRect(&CombinedRect, DestRect, RectEnum.arcl + i);
Pt.x = SourcePoint->x + CombinedRect.left - DestRect->left;
Pt.y = SourcePoint->y + CombinedRect.top - DestRect->top;
Pt.x = FinalSourcePoint.x + CombinedRect.left - DestRect->left;
Pt.y = FinalSourcePoint.y + CombinedRect.top - DestRect->top;
Ret = (*BltRectFunc)(Dest, Source, Mask, ColorTranslation, &CombinedRect,
&Pt, MaskPoint, Brush, BrushPoint, rop4) &&
Ret;