paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-03 15:58:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

carbon: fix for possible mem corruption on ExtTextDraw

Browse Source 
git-svn-id: trunk@24649 -
This commit is contained in:
dmitry 2010-04-16 08:59:46 +00:00
parent fe226671fc
commit 3584c1d8bc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/carbon/carbongdiobjects.pp
View File

@ -1005,6 +1005,7 @@ var
Layouts : PATSLayoutRecordArray; Layouts : PATSLayoutRecordArray;
LayCount : ItemCount; LayCount : ItemCount;
begin begin
if not Assigned(FDX) or (FDXCount=0) then Exit;
{ if idx < FDXCount then { if idx < FDXCount then
begin} begin}
Layouts:=nil; Layouts:=nil;
@ -1016,7 +1017,7 @@ begin
if Assigned(Layouts) and (Laycount>0) then if Assigned(Layouts) and (Laycount>0) then
begin begin
ofs:=0; ofs:=0;
for i:=0 to Min(FDXCount, Min(LayCount, Count)) do for i:=0 to Min(FDXCount, Min(LayCount, Count))-1 do
begin begin
Deltas^[i] := Layouts^[i].realPos-Long2Fix(ofs); Deltas^[i] := Layouts^[i].realPos-Long2Fix(ofs);
Layouts^[i].realPos:=Long2Fix(ofs); Layouts^[i].realPos:=Long2Fix(ofs);
@ -1062,6 +1063,9 @@ begin
theValue := @OverSpec; theValue := @OverSpec;
ATSUSetTextLayoutRefCon(FLayout, UInt32(Self)); ATSUSetTextLayoutRefCon(FLayout, UInt32(Self));
ATSUSetLayoutControls (FLayout, 1, @theTag, @theSize, @theValue); ATSUSetLayoutControls (FLayout, 1, @theTag, @theSize, @theValue);
end else begin
FDX:=nil;
FDXCount:=0;
end; end;
if OSError(ATSUDrawText(FLayout, kATSUFromTextBeginning, kATSUToTextEnd, if OSError(ATSUDrawText(FLayout, kATSUFromTextBeginning, kATSUToTextEnd,