mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-28 03:21:44 +02:00
fixed buffer overrun and added several checks
git-svn-id: trunk@1293 -
This commit is contained in:
parent
9c042a3498
commit
68239a729c
@ -1161,6 +1161,10 @@ begin
|
|||||||
ListViewWidget:= PGtkCList(GetWidgetInfo(
|
ListViewWidget:= PGtkCList(GetWidgetInfo(
|
||||||
Pointer(ListView.Handle), True)^.ImplementationWidget);
|
Pointer(ListView.Handle), True)^.ImplementationWidget);
|
||||||
Count:=ListViewWidget^.columns;
|
Count:=ListViewWidget^.columns;
|
||||||
|
if Count=0 then begin
|
||||||
|
writeln('WARNING: ListViewWidget^.columns=0');
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
GetMem(Titles,SizeOf(PGChar)*Count);
|
GetMem(Titles,SizeOf(PGChar)*Count);
|
||||||
Titles[0]:=#0;
|
Titles[0]:=#0;
|
||||||
for i:=1 to Count-1 do Titles[i]:=nil;
|
for i:=1 to Count-1 do Titles[i]:=nil;
|
||||||
@ -4187,8 +4191,8 @@ begin
|
|||||||
gtk_clist_column_titles_passive (GTK_CLIST (TempWidget));
|
gtk_clist_column_titles_passive (GTK_CLIST (TempWidget));
|
||||||
|
|
||||||
// add items (the item properties are set via LM_SETPROPERTIES)
|
// add items (the item properties are set via LM_SETPROPERTIES)
|
||||||
GetMem(Titles,SizeOf(PChar)*GTK_CLIST (TempWidget)^.columns);
|
GetMem(Titles,SizeOf(PGChar)*GTK_CLIST (TempWidget)^.columns);
|
||||||
for TempInt:=0 to GTK_CLIST (TempWidget)^.columns do
|
for TempInt:=0 to GTK_CLIST (TempWidget)^.columns-1 do
|
||||||
Titles[TempInt]:=nil;
|
Titles[TempInt]:=nil;
|
||||||
for TempInt:=0 to Items.Count-1 do begin
|
for TempInt:=0 to Items.Count-1 do begin
|
||||||
if Items[TempInt].Caption<>'' then
|
if Items[TempInt].Caption<>'' then
|
||||||
@ -4806,16 +4810,12 @@ var
|
|||||||
procedure UpdateTabLabel;
|
procedure UpdateTabLabel;
|
||||||
var TheCaption: PChar;
|
var TheCaption: PChar;
|
||||||
begin
|
begin
|
||||||
TheCaption := StrAlloc(Length(ThePage.Caption) + 1);
|
TheCaption:=PChar(ThePage.Caption);
|
||||||
try
|
if TheCaption=nil then
|
||||||
StrPCopy(TheCaption, ThePage.Caption);
|
TheCaption:=#0;
|
||||||
|
gtk_label_set_text(PGtkLabel(TabLabelWidget),TheCaption);
|
||||||
gtk_label_set_text(PGtkLabel(TabLabelWidget),TheCaption);
|
if MenuLabelWidget<>nil then
|
||||||
if MenuLabelWidget<>nil then
|
gtk_label_set_text(PGtkLabel(MenuLabelWidget),TheCaption);
|
||||||
gtk_label_set_text(PGtkLabel(MenuLabelWidget),TheCaption);
|
|
||||||
finally
|
|
||||||
StrDispose(TheCaption);
|
|
||||||
end;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure UpdateTabCloseBtn;
|
procedure UpdateTabCloseBtn;
|
||||||
@ -6631,6 +6631,9 @@ end;
|
|||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.289 2002/11/18 13:38:44 mattias
|
||||||
|
fixed buffer overrun and added several checks
|
||||||
|
|
||||||
Revision 1.288 2002/11/16 11:22:57 mbukovjan
|
Revision 1.288 2002/11/16 11:22:57 mbukovjan
|
||||||
Fixes to MaxLength. TCustomMemo now has MaxLength, too.
|
Fixes to MaxLength. TCustomMemo now has MaxLength, too.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user