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

Use signed instead of unsigned integer in a structure to prevent range check errors. Issue #22760

Browse Source 
git-svn-id: trunk@38465 -
This commit is contained in:
juha 2012-08-31 16:19:36 +00:00
parent 4ae545e36d
commit f26e63161d
5 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
designer/framedesigner.pas
View File

@ -164,7 +164,7 @@ begin
LookupRoot.DesignInfo := LeftTopToDesignInfo(Left, Top); LookupRoot.DesignInfo := LeftTopToDesignInfo(Left, Top);
// always fill the whole designer form // always fill the whole designer form
TControl(LookupRoot).SetBounds(0, 0, Width, Height); TControl(LookupRoot).SetBounds(0, 0, Width, Height);
//DebugLn(['TFrameDesignerForm.DoSaveBounds ',Left,',',Top,' ',LongRec(LookupRoot.DesignInfo).Lo,',',LongRec(LookupRoot.DesignInfo).hi]); //DebugLn(['TFrameDesignerForm.DoSaveBounds ',Left,',',Top,' ',LazLongRec(LookupRoot.DesignInfo).Lo,',',LongRec(LookupRoot.DesignInfo).hi]);
end end
else else
if LookupRoot <> nil then if LookupRoot <> nil then

2
ide/customformeditor.pp
View File

@ -1298,7 +1298,7 @@ begin
// no parent and not a form // no parent and not a form
AControl.SetBounds(0,0,CompWidth,CompHeight); AControl.SetBounds(0,0,CompWidth,CompHeight);
AControl.DesignInfo := LeftTopToDesignInfo(CompLeft, CompTop); AControl.DesignInfo := LeftTopToDesignInfo(CompLeft, CompTop);
//DebugLn(['TCustomFormEditor.CreateComponent ',dbgsName(AControl),' ',LongRec(AControl.DesignInfo).Lo,',',LongRec(AControl.DesignInfo).Hi]); //DebugLn(['TCustomFormEditor.CreateComponent ',dbgsName(AControl),' ',LazLongRec(AControl.DesignInfo).Lo,',',LongRec(AControl.DesignInfo).Hi]);
end; end;
end end
else else

14
ideintf/formeditingintf.pas
View File

@ -23,7 +23,7 @@ interface
uses uses
Math, Classes, SysUtils, LCLProc, TypInfo, types, Forms, Controls, Math, Classes, SysUtils, LCLProc, TypInfo, types, Forms, Controls,
ProjectIntf, ComponentEditors, ObjectInspector; LCLClasses, ProjectIntf, ComponentEditors, ObjectInspector;
const const
ComponentPaletteImageWidth = 24; ComponentPaletteImageWidth = 24;
@ -241,24 +241,24 @@ end;
function LeftFromDesignInfo(ADesignInfo: LongInt): SmallInt; function LeftFromDesignInfo(ADesignInfo: LongInt): SmallInt;
begin begin
Result := LongRec(ADesignInfo).Lo; Result := LazLongRec(ADesignInfo).Lo;
end; end;
function TopFromDesignInfo(ADesignInfo: LongInt): SmallInt; function TopFromDesignInfo(ADesignInfo: LongInt): SmallInt;
begin begin
Result := LongRec(ADesignInfo).Hi; Result := LazLongRec(ADesignInfo).Hi;
end; end;
function LeftTopToDesignInfo(const ALeft, ATop: SmallInt): LongInt; function LeftTopToDesignInfo(const ALeft, ATop: SmallInt): LongInt;
begin begin
LongRec(Result).Lo:=ALeft; LazLongRec(Result).Lo:=ALeft;
LongRec(Result).Hi:=ATop; LazLongRec(Result).Hi:=ATop;
end; end;
procedure DesignInfoToLeftTop(ADesignInfo: LongInt; out ALeft, ATop: SmallInt); procedure DesignInfoToLeftTop(ADesignInfo: LongInt; out ALeft, ATop: SmallInt);
begin begin
ALeft := LongRec(ADesignInfo).Lo; ALeft := LazLongRec(ADesignInfo).Lo;
ATop := LongRec(ADesignInfo).Hi; ATop := LazLongRec(ADesignInfo).Hi;
end; end;
{ TDesignerMediator } { TDesignerMediator }

14
lcl/include/customframe.inc
View File

@ -40,7 +40,7 @@ var
Temp: LongInt; Temp: LongInt;
begin begin
Temp:=DesignInfo; Temp:=DesignInfo;
LongRec(Temp).Lo:=Reader.ReadInteger; LazLongRec(Temp).Lo:=Reader.ReadInteger;
DesignInfo:=Temp; DesignInfo:=Temp;
end; end;
@ -49,18 +49,18 @@ var
Temp: LongInt; Temp: LongInt;
begin begin
Temp:=DesignInfo; Temp:=DesignInfo;
LongRec(Temp).Hi:=Reader.ReadInteger; LazLongRec(Temp).Hi:=Reader.ReadInteger;
DesignInfo:=Temp; DesignInfo:=Temp;
end; end;
procedure TCustomFrame.WriteDesignLeft(Writer: TWriter); procedure TCustomFrame.WriteDesignLeft(Writer: TWriter);
begin begin
Writer.WriteInteger(LongRec(DesignInfo).Lo); Writer.WriteInteger(LazLongRec(DesignInfo).Lo);
end; end;
procedure TCustomFrame.WriteDesignTop(Writer: TWriter); procedure TCustomFrame.WriteDesignTop(Writer: TWriter);
begin begin
Writer.WriteInteger(LongRec(DesignInfo).Hi); Writer.WriteInteger(LazLongRec(DesignInfo).Hi);
end; end;
class procedure TCustomFrame.WSRegisterClass; class procedure TCustomFrame.WSRegisterClass;
@ -142,15 +142,15 @@ end;
procedure TCustomFrame.DefineProperties(Filer: TFiler); procedure TCustomFrame.DefineProperties(Filer: TFiler);
Var Var
Ancestor: TComponent; Ancestor: TComponent;
Temp: longint; Temp: LongInt;
begin begin
Temp:=0; Temp:=0;
Ancestor:=TComponent(Filer.Ancestor); Ancestor:=TComponent(Filer.Ancestor);
if Assigned(Ancestor) then Temp:=Ancestor.DesignInfo; if Assigned(Ancestor) then Temp:=Ancestor.DesignInfo;
Filer.Defineproperty('DesignLeft',@ReadDesignLeft,@WriteDesignLeft, Filer.Defineproperty('DesignLeft',@ReadDesignLeft,@WriteDesignLeft,
(longrec(DesignInfo).Lo<>Longrec(Temp).Lo)); (LazLongRec(DesignInfo).Lo<>LazLongrec(Temp).Lo));
Filer.Defineproperty('DesignTop',@ReadDesignTop,@WriteDesignTop, Filer.Defineproperty('DesignTop',@ReadDesignTop,@WriteDesignTop,
(longrec(DesignInfo).Hi<>Longrec(Temp).Hi)); (LazLongRec(DesignInfo).Hi<>LazLongrec(Temp).Hi));
end; end;
procedure TCustomFrame.CalculatePreferredSize(var PreferredWidth, procedure TCustomFrame.CalculatePreferredSize(var PreferredWidth,

12
lcl/lclclasses.pp
View File

@ -33,6 +33,18 @@ uses
type type
// SysUtils.LongRec has unsigned Word for Lo and Hi,
// we need a similar record with signed ShortInt
LazLongRec = packed record
case Integer of
{$ifdef FPC_LITTLE_ENDIAN}
0 : (Lo,Hi : ShortInt);
{$else FPC_LITTLE_ENDIAN}
0 : (Hi,Lo : ShortInt);
{$endif FPC_LITTLE_ENDIAN}
1 : (Bytes : Array[0..3] of Byte);
end;
{ TLCLComponent } { TLCLComponent }
TLCLComponent = class(TComponent) TLCLComponent = class(TComponent)