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

SynEdit: win, IME Handler: fix reference to freed object / leak. Issue #0027714

Browse Source 
git-svn-id: trunk@48470 -
This commit is contained in:
martin 2015-03-23 23:02:04 +00:00
parent e36c3eb12f
commit 875cfefd74
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/synedit/lazsynimm.pas
View File

@ -464,7 +464,11 @@ begin
TCustomSynEdit(FriendEdit).UnregisterBeforeMouseDownHandler(@DoOnMouse); TCustomSynEdit(FriendEdit).UnregisterBeforeMouseDownHandler(@DoOnMouse);
TCustomSynEdit(FriendEdit).UnregisterCommandHandler(@DoOnCommand); TCustomSynEdit(FriendEdit).UnregisterCommandHandler(@DoOnCommand);
TCustomSynEdit(FriendEdit).UnRegisterStatusChangedHandler(@DoStatusChanged); TCustomSynEdit(FriendEdit).UnRegisterStatusChangedHandler(@DoStatusChanged);
TSynEditMarkupManager(MarkupMgr).RemoveMarkUp(FImeMarkupSelection);
TSynEditMarkupManager(MarkupMgr).RemoveMarkUp(FImeMarkupSelection2);
FreeAndNil(FImeMarkupSelection);
FreeAndNil(FImeMarkupSelection2);
FreeAndNil(FImeBlockSelection); FreeAndNil(FImeBlockSelection);
FreeAndNil(FImeBlockSelection2); FreeAndNil(FImeBlockSelection2);
inherited Destroy; inherited Destroy;

6
components/synedit/synedit.pp
View File

@ -2419,6 +2419,9 @@ begin
FreeAndNil(FRightGutterArea); FreeAndNil(FRightGutterArea);
FreeAndNil(FTextArea); FreeAndNil(FTextArea);
FreeAndNil(fTSearch); FreeAndNil(fTSearch);
{$IFDEF WinIME}
FreeAndNil(FImeHandler);
{$ENDIF}
FreeAndNil(fMarkupManager); FreeAndNil(fMarkupManager);
FreeAndNil(fBookMarkOpt); FreeAndNil(fBookMarkOpt);
FreeAndNil(fKeyStrokes); FreeAndNil(fKeyStrokes);
@ -2431,9 +2434,6 @@ begin
FreeAndNil(FRightGutter); FreeAndNil(FRightGutter);
FreeAndNil(FPaintLineColor); FreeAndNil(FPaintLineColor);
FreeAndNil(FPaintLineColor2); FreeAndNil(FPaintLineColor2);
{$IFDEF WinIME}
FreeAndNil(FImeHandler);
{$ENDIF}
FreeAndNil(fTextDrawer); FreeAndNil(fTextDrawer);
FreeAndNil(fFontDummy); FreeAndNil(fFontDummy);
DestroyMarkList; // before detach from FLines DestroyMarkList; // before detach from FLines