paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-20 12:09:06 +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

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

@ -52,6 +52,9 @@ var
CharWidth,CharHeight: SmallInt;
begin
dc:=BeginPaint(hwnd,FarAddr(ps));
{ 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;
@ -81,6 +84,7 @@ begin
SetTextColor(dc,oldtextcolor);
SetBkColor(dc,oldbkcolor);
SelectObject(dc,oldfont);
end;
EndPaint(hwnd,FarAddr(ps));
end;