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

LCL: Consider that MemSize can return 0 with a custom MemoryManager. Merge request !27 by Sergey Larin.

Browse Source
This commit is contained in:
Juha 2021-10-28 11:18:14 +03:00
parent 8af9cd0918
commit 75aebbee85
11 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/include/intfbasewinapi.inc
View File

@ -1553,11 +1553,11 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrUInt(SizeOf(TTriVertex) * NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrUInt(SizeOf(TTriVertex) * NumVertices)) then
Exit; Exit;
//Sanity Checks For Meshes Size vs. Count //Sanity Checks For Meshes Size vs. Count
if MemSize(Meshes) < (MeshSize[DoFillTriangle] * Cardinal(NumMeshes)) then if MemSizeLessThan(MemSize(Meshes), (MeshSize[DoFillTriangle] * Cardinal(NumMeshes))) then
Exit; Exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do

7
lcl/interfacebase.pp
View File

@ -176,6 +176,8 @@ type
function GetDefaultLCLWidgetType: TLCLPlatform; function GetDefaultLCLWidgetType: TLCLPlatform;
function GetLCLWidgetTypeName: string; function GetLCLWidgetTypeName: string;
function MemSizeLessThan(AMemSize, AThen: PtrUInt): Boolean; inline;
const const
{ Constants for the routine TWidgetSet.GetLCLCapability } { Constants for the routine TWidgetSet.GetLCLCapability }
LCL_CAPABILITY_NO = 0; LCL_CAPABILITY_NO = 0;
@ -233,6 +235,11 @@ begin
Result:=LCLPlatformDirNames[GetDefaultLCLWidgetType]; Result:=LCLPlatformDirNames[GetDefaultLCLWidgetType];
end; end;
function MemSizeLessThan(AMemSize, AThen: PtrUInt): Boolean; inline;
begin
Result:=(AMemSize<>0) and (AMemSize<AThen);
end;
{ TDialogButtons } { TDialogButtons }
procedure TDialogButtons.SetCancelButton(const AValue: TDialogButton); procedure TDialogButtons.SetCancelButton(const AValue: TDialogButton);

2
lcl/interfaces/carbon/carbonwinapi.inc
View File

@ -2477,7 +2477,7 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices)) then
exit; exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do

4
lcl/interfaces/customdrawn/customdrawnwinapi.inc
View File

@ -4468,11 +4468,11 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices)) then
exit; exit;
//Sanity Checks For Meshes Size vs. Count //Sanity Checks For Meshes Size vs. Count
if MemSize(Meshes) < PtrUInt(MeshSize[DoFillTriangle]*NumMeshes) then if MemSizeLessThan(MemSize(Meshes), PtrUInt(MeshSize[DoFillTriangle]*NumMeshes)) then
exit; exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do

4
lcl/interfaces/customdrawn/customdrawnwinapi_android.inc
View File

@ -4544,11 +4544,11 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices)) then
exit; exit;
//Sanity Checks For Meshes Size vs. Count //Sanity Checks For Meshes Size vs. Count
if MemSize(Meshes) < PtrUInt(MeshSize[DoFillTriangle]*NumMeshes) then if MemSizeLessThan(MemSize(Meshes), PtrUInt(MeshSize[DoFillTriangle]*NumMeshes)) then
exit; exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do

4
lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc
View File

@ -4528,11 +4528,11 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices)) then
exit; exit;
//Sanity Checks For Meshes Size vs. Count //Sanity Checks For Meshes Size vs. Count
if MemSize(Meshes) < PtrUInt(MeshSize[DoFillTriangle]*NumMeshes) then if MemSizeLessThan(MemSize(Meshes), PtrUInt(MeshSize[DoFillTriangle]*NumMeshes)) then
exit; exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do

2
lcl/interfaces/gtk/gtkwidgetset.inc
View File

@ -1763,7 +1763,7 @@ begin
BitSize := longint(SizeOf(Byte)) BitSize := longint(SizeOf(Byte))
*(longint(biSizeImage) div biHeight) *(longint(biSizeImage) div biHeight)
*longint(NumScans + StartScan); *longint(NumScans + StartScan);
if MemSize(Bits) < PtrInt(BitSize) if MemSizeLessThan(MemSize(Bits), PtrInt(BitSize))
then begin then begin
DebugLn('WARNING: [TGtkWidgetSet.InternalGetDIBits] not enough memory allocated for Bits!'); DebugLn('WARNING: [TGtkWidgetSet.InternalGetDIBits] not enough memory allocated for Bits!');
exit; exit;

4
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -6676,11 +6676,11 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrInt(SizeOf(tagTRIVERTEX)*NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrInt(SizeOf(tagTRIVERTEX)*NumVertices)) then
exit; exit;
//Sanity Checks For Meshes Size vs. Count //Sanity Checks For Meshes Size vs. Count
if MemSize(Meshes) < PtrInt(MeshSize[DoFillTriangle]*NumMeshes) then if MemSizeLessThan(MemSize(Meshes), PtrInt(MeshSize[DoFillTriangle]*NumMeshes)) then
exit; exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do

2
lcl/interfaces/gtk2/gtk2widgetset.inc
View File

@ -2991,7 +2991,7 @@ begin
BitSize := longint(SizeOf(Byte)) BitSize := longint(SizeOf(Byte))
*(longint(biSizeImage) div biHeight) *(longint(biSizeImage) div biHeight)
*longint(NumScans + StartScan); *longint(NumScans + StartScan);
if MemSize(Bits) < PtrInt(BitSize) if MemSizeLessThan(MemSize(Bits), PtrInt(BitSize))
then begin then begin
DebugLn('WARNING: [TGtk2WidgetSet.InternalGetDIBits] not enough memory allocated for Bits!'); DebugLn('WARNING: [TGtk2WidgetSet.InternalGetDIBits] not enough memory allocated for Bits!');
exit; exit;

4
lcl/interfaces/qt/qtwinapi.inc
View File

@ -4810,11 +4810,11 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices)) then
exit; exit;
//Sanity Checks For Meshes Size vs. Count //Sanity Checks For Meshes Size vs. Count
if MemSize(Meshes) < PtrUInt(MeshSize[DoFillTriangle]*NumMeshes) then if MemSizeLessThan(MemSize(Meshes), PtrUInt(MeshSize[DoFillTriangle]*NumMeshes)) then
exit; exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do

4
lcl/interfaces/qt5/qtwinapi.inc
View File

@ -4752,11 +4752,11 @@ begin
Result := False; Result := False;
//Sanity Checks For Vertices Size vs. Count //Sanity Checks For Vertices Size vs. Count
if MemSize(Vertices) < PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices) then if MemSizeLessThan(MemSize(Vertices), PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices)) then
exit; exit;
//Sanity Checks For Meshes Size vs. Count //Sanity Checks For Meshes Size vs. Count
if MemSize(Meshes) < PtrUInt(MeshSize[DoFillTriangle]*NumMeshes) then if MemSizeLessThan(MemSize(Meshes), PtrUInt(MeshSize[DoFillTriangle]*NumMeshes)) then
exit; exit;
for I := 0 to NumMeshes - 1 do for I := 0 to NumMeshes - 1 do