Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the crash due to NPPM_DESTROYSCINTILLAHANDLE message

Browse Source 
Destroying allocated Scintilla makes Notepad++ crash because created Scintilla view's pointer is added into _referees of Buffer object automatically.
The deallocated scintilla view in _referees is used in Buffer::nextUntitledNewNumber().

So we do nothing here and let Notepad++ destroys allocated Scintilla while it exit and we keep this message for the sake of compability withe the existing plugins.

Fix #4487, close #1500, close #5949
This commit is contained in:
Don HO 2019-07-25 13:11:42 +02:00
parent 21939308b0
commit 4a80a125c0
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PowerEditor/src/NppBigSwitch.cpp
View File

@ -1244,7 +1244,15 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
case NPPM_DESTROYSCINTILLAHANDLE:
{
return _scintillaCtrls4Plugins.destroyScintilla(reinterpret_cast<HWND>(lParam));
//return _scintillaCtrls4Plugins.destroyScintilla(reinterpret_cast<HWND>(lParam));
// Destroying allocated Scintilla makes Notepad++ crash
// because created Scintilla view's pointer is added into _referees of Buffer object automatically.
// The deallocated scintilla view in _referees is used in Buffer::nextUntitledNewNumber().
// So we do nothing here and let Notepad++ destroy allocated Scintilla while it exits
// and we keep this message for the sake of compability withe the existing plugins.
return true;
}
case NPPM_GETNBUSERLANG:

2
PowerEditor/src/ScitillaComponent/ScintillaCtrls.cpp
View File

@ -58,6 +58,7 @@ ScintillaEditView * ScintillaCtrls::getScintillaEditViewFrom(HWND handle2Find)
return _scintVector[i];
}
/*
bool ScintillaCtrls::destroyScintilla(HWND handle2Destroy)
{
int i = getIndexFrom(handle2Destroy);
@ -71,6 +72,7 @@ bool ScintillaCtrls::destroyScintilla(HWND handle2Destroy)
_scintVector.erase(it2delete);
return true;
}
*/
void ScintillaCtrls::destroy()
{

2
PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
View File

@ -43,7 +43,7 @@ public :
HWND createSintilla(HWND hParent);
ScintillaEditView * getScintillaEditViewFrom(HWND handle2Find);
bool destroyScintilla(HWND handle2Destroy);
//bool destroyScintilla(HWND handle2Destroy);
void destroy();
private: