paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-19 20:59:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix invalid pointer access in the handling of WM_PAINT before InitVideo has

Browse Source 
allocated videobuf in the win16 video unit

git-svn-id: trunk@37638 -
This commit is contained in:
nickysn 2017-12-01 14:35:50 +00:00
parent 87846323c2
commit d3d60568e7
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
packages/rtl-console/src/win16/video.pp
View File

@ -52,35 +52,39 @@ var
CharWidth,CharHeight: SmallInt;
begin
dc:=BeginPaint(hwnd,FarAddr(ps));
oldfont:=SelectObject(dc,GetStockObject(OEM_FIXED_FONT));
GetTextMetrics(dc,FarAddr(Metrics));
CharWidth:=Metrics.tmMaxCharWidth;
CharHeight:=Metrics.tmHeight+Metrics.tmExternalLeading;
x1:=ps.rcPaint.left div CharWidth;
x2:=1+ps.rcPaint.right div CharWidth;
y1:=ps.rcPaint.top div CharHeight;
y2:=1+ps.rcPaint.bottom div CharHeight;
if x1<0 then
x1:=0;
if y1<0 then
y1:=0;
if x2>=ScreenWidth then
x2:=ScreenWidth-1;
if y2>=ScreenHeight then
y2:=ScreenHeight-1;
oldtextcolor:=GetTextColor(dc);
oldbkcolor:=GetBkColor(dc);
for y:=y1 to y2 do
for x:=x1 to x2 do
begin
ch:=videobuf^[y*ScreenWidth+x];
SetTextColor(dc,ColorRefs[(ch shr 8) and 15]);
SetBkColor(dc,ColorRefs[(ch shr 12) and 15]);
TextOut(dc,x*CharWidth,y*CharHeight,FarAddr(ch),1);
end;
SetTextColor(dc,oldtextcolor);
SetBkColor(dc,oldbkcolor);
SelectObject(dc,oldfont);
{ don't do anything, before the video unit has been fully initialized... }
if videobuf<>nil then
begin
oldfont:=SelectObject(dc,GetStockObject(OEM_FIXED_FONT));
GetTextMetrics(dc,FarAddr(Metrics));
CharWidth:=Metrics.tmMaxCharWidth;
CharHeight:=Metrics.tmHeight+Metrics.tmExternalLeading;
x1:=ps.rcPaint.left div CharWidth;
x2:=1+ps.rcPaint.right div CharWidth;
y1:=ps.rcPaint.top div CharHeight;
y2:=1+ps.rcPaint.bottom div CharHeight;
if x1<0 then
x1:=0;
if y1<0 then
y1:=0;
if x2>=ScreenWidth then
x2:=ScreenWidth-1;
if y2>=ScreenHeight then
y2:=ScreenHeight-1;
oldtextcolor:=GetTextColor(dc);
oldbkcolor:=GetBkColor(dc);
for y:=y1 to y2 do
for x:=x1 to x2 do
begin
ch:=videobuf^[y*ScreenWidth+x];
SetTextColor(dc,ColorRefs[(ch shr 8) and 15]);
SetBkColor(dc,ColorRefs[(ch shr 12) and 15]);
TextOut(dc,x*CharWidth,y*CharHeight,FarAddr(ch),1);
end;
SetTextColor(dc,oldtextcolor);
SetBkColor(dc,oldbkcolor);
SelectObject(dc,oldfont);
end;
EndPaint(hwnd,FarAddr(ps));
end;