tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 07:15:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash (regression) due to "new-less" of NppParameters

Browse Source 
The commit 'Make NppParameters singleton "new-less"' make NppParameters instantiate in the stack instead of allocating in the heap:
3dbb2c4b8e

It makes Notepad++ crash:
https://community.notepad-plus-plus.org/topic/18316/notepad-7-8-release-candidate-3/4

The crash is on following code:

  vector<MacroShortcut> & vShortcuts = NppParameters::getInstance().getMacroList();
  size_t nbItems = vShortcuts.size();
  for (size_t itemIndex2 = 0; itemIndex2 < nbItems; ++itemIndex2)
  {
  ...

vShortcuts.size() here return a random large number, which makes crash.

The explanation about vector::size() unexpected behaviour:
https://stackoverflow.com/questions/30548944/c-vector-size-is-wrong-and-higher-than-the-number-of-elements

Obviously the stack size is not large enough to contain NppParameters singleton in 64 bits.
This commit is contained in:
Don HO 2019-10-03 14:05:50 +02:00
parent 7651d703a9
commit 10f6ff6c1f
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/src/Parameters.h
View File

@ -1293,8 +1293,8 @@ class NppParameters final
{ {
public: public:
static NppParameters& getInstance() { static NppParameters& getInstance() {
static NppParameters instance; static NppParameters* instance = new NppParameters;
return instance; return *instance;
}; };
static LangType getLangIDFromStr(const TCHAR *langName); static LangType getLangIDFromStr(const TCHAR *langName);
static generic_string getLocPathFromStr(const generic_string & localizationCode); static generic_string getLocPathFromStr(const generic_string & localizationCode);
@ -1658,6 +1658,7 @@ private:
NppParameters(NppParameters&&) = delete; NppParameters(NppParameters&&) = delete;
NppParameters& operator=(NppParameters&&) = delete; NppParameters& operator=(NppParameters&&) = delete;
TiXmlDocument *_pXmlDoc = nullptr; TiXmlDocument *_pXmlDoc = nullptr;
TiXmlDocument *_pXmlUserDoc = nullptr; TiXmlDocument *_pXmlUserDoc = nullptr;
TiXmlDocument *_pXmlUserStylerDoc = nullptr; TiXmlDocument *_pXmlUserStylerDoc = nullptr;