Fix crash (regression) in v8.8.9 on langs.xml update

The regression was introduced by:
notepad-plus-plus@c64b81e

Close notepad-plus-plus#17281

Author: pryrt

PowerEditor/src/Parameters.cpp

@@ -2095,7 +2095,7 @@ void NppParameters::updateLangXml(TiXmlElement* mainElemUser, TiXmlElement* main
 		langFromModel = langFromModel->NextSiblingElement(L"Language"))
 	{
 		std::wstring modelLanguageName = langFromModel->Attribute(L"name");
-		if (!modelLanguageName.length())
+		if (modelLanguageName.empty())
 			continue;
 
 		// see if language already exists in UserLanguages
@@ -2120,7 +2120,7 @@ void NppParameters::updateLangXml(TiXmlElement* mainElemUser, TiXmlElement* main
 				keywordsFromModel = keywordsFromModel->NextSiblingElement(L"Keywords"))
 			{
 				std::wstring modelKeywordsName = keywordsFromModel->Attribute(L"name");
-				if (!modelKeywordsName.length())
+				if (modelKeywordsName.empty())
 					continue;
 
 				// does this Keywords element exist in User already?
@@ -2129,8 +2129,8 @@ void NppParameters::updateLangXml(TiXmlElement* mainElemUser, TiXmlElement* main
 					// if Keywords element in user langs.xml, need to check to see if any words are missing from its contents
 
 					// start by extracting the list of words in the user version of this Keywords element
-					TiXmlNode* pChild = mapUserKeywords[modelKeywordsName]->FirstChild();
-					std::wstring wsText = pChild ? pChild->Value() : L"";
+					TiXmlNode* pKwsValue = mapUserKeywords[modelKeywordsName]->FirstChild();
+					std::wstring wsText = pKwsValue ? pKwsValue->Value() : L"";
 					std::vector<std::wstring> vwsUserWords{};
 					std::map<std::wstring, bool> mapUserWords{};
 					if (!wsText.empty())
@@ -2146,57 +2146,68 @@ void NppParameters::updateLangXml(TiXmlElement* mainElemUser, TiXmlElement* main
 
 					// then go through each word in the model, and add it to the list if it's not already there
 					int nWordsAdded = 0;
-					TiXmlNode* pChildModel = keywordsFromModel->FirstChild();
-					std::wstring wsTextModel = pChildModel ? pChildModel->Value() : L"";
-					if (!wsTextModel.empty())
+					TiXmlNode* pKwsValueModel = keywordsFromModel->FirstChild();
+					std::wstring wsTextModel = pKwsValueModel ? pKwsValueModel->Value() : L"";
+					if (!pKwsValue)
 					{
-						std::wstring wsToken;
-						std::wistringstream wstrm(wsTextModel);
-						while (wstrm >> wsToken)
+						if (pKwsValueModel)
 						{
-							if (!mapUserWords.contains(wsToken))
-							{
-								vwsUserWords.push_back(wsToken);
-								mapUserWords[wsToken] = true;
-								++nWordsAdded;
-							}
+							TiXmlNode* p_clone = pKwsValueModel->Clone();
+							mapUserKeywords[modelKeywordsName]->LinkEndChild(p_clone);
 						}
 					}
-
-					// if there were any words added to the list, need to update the element contents
-					if (nWordsAdded)
+					else
 					{
-						// sort the words in standard case-sensitive alphabetical order
-						std::sort(vwsUserWords.begin(), vwsUserWords.end());
-
-						// convert that list into space-separated string, with at most 8000 characters per line
-						size_t lineLength = 0, maxLineLength = 8000;
-						bool first = true;
-						std::wstring wsOutputWords(L"");
-						for (auto wsWord : vwsUserWords)
+
+						if (!wsTextModel.empty())
 						{
-							if (!first)
+							std::wstring wsToken;
+							std::wistringstream wstrm(wsTextModel);
+							while (wstrm >> wsToken)
 							{
-								// space between words
-								wsOutputWords += L" ";
-								lineLength += 1;
+								if (!mapUserWords.contains(wsToken))
+								{
+									vwsUserWords.push_back(wsToken);
+									++nWordsAdded;
+								}
 							}
-							first = false;
+						}
 
-							if (lineLength + wsWord.length() >= maxLineLength)
+						// if there were any words added to the list, need to update the element contents
+						if (nWordsAdded)
+						{
+							// sort the words in standard case-sensitive alphabetical order
+							std::sort(vwsUserWords.begin(), vwsUserWords.end());
+
+							// convert that list into space-separated string, with at most 8000 characters per line
+							size_t lineLength = 0, maxLineLength = 8000;
+							bool first = true;
+							std::wstring wsOutputWords(L"");
+							for (auto wsWord : vwsUserWords)
 							{
-								// start next line
-								lineLength = 0;
-								wsOutputWords += L"\n                ";
+								if (!first)
+								{
+									// space between words
+									wsOutputWords += L" ";
+									lineLength += 1;
+								}
+								first = false;
+
+								if (lineLength + wsWord.length() >= maxLineLength)
+								{
+									// start next line
+									lineLength = 0;
+									wsOutputWords += L"\n                ";
+								}
+
+								// add this word to the output string
+								wsOutputWords += wsWord;
+								lineLength += wsWord.length();
 							}
 
-							// add this word to the output string
-							wsOutputWords += wsWord;
-							lineLength += wsWord.length();
+							// and update the XML's value
+							pKwsValue->SetValue(wsOutputWords);
 						}
-
-						// and update the XML's value
-						pChild->SetValue(wsOutputWords);
 					}
 				}
 				else
@@ -2250,7 +2261,7 @@ void NppParameters::updateStylesXml(TiXmlElement* rootUser, TiXmlElement* rootMo
 		lexerFromModel = lexerFromModel->NextSiblingElement(L"LexerType"))
 	{
 		std::wstring modelLexerName = lexerFromModel->Attribute(L"name");
-		if (!modelLexerName.length())
+		if (modelLexerName.empty())
 			continue;
 
 		// see if lexer already exists in UserStyles
@@ -2275,7 +2286,7 @@ void NppParameters::updateStylesXml(TiXmlElement* rootUser, TiXmlElement* rootMo
 				wordsStyleFromModel = wordsStyleFromModel->NextSiblingElement(L"WordsStyle"))
 			{
 				std::wstring modelWordsStyleID = wordsStyleFromModel->Attribute(L"styleID");
-				if (!modelWordsStyleID.length())
+				if (modelWordsStyleID.empty())
 					continue;
 
 				// does it exist in User already?
@@ -2327,7 +2338,7 @@ void NppParameters::updateStylesXml(TiXmlElement* rootUser, TiXmlElement* rootMo
 	{
 		// use StyleID for the map's key, or if styleID not found or if "0" then use the widget's name (lowercase) instead
 		std::wstring widgetKey = widgetFromUser->Attribute(L"styleID");
-		if (!widgetKey.length() || widgetKey == L"0" || (decStrVal(widgetKey.c_str()) > 256) || (decStrVal(widgetKey.c_str()) < 0))
+		if (widgetKey.empty() || widgetKey == L"0" || (decStrVal(widgetKey.c_str()) > 256) || (decStrVal(widgetKey.c_str()) < 0))
 			widgetKey = widgetFromUser->Attribute(L"name");
 
 		// add widget to map using the key
@@ -2345,9 +2356,9 @@ void NppParameters::updateStylesXml(TiXmlElement* rootUser, TiXmlElement* rootMo
 	{
 		// extract the key
 		std::wstring widgetKey = widgetFromModel->Attribute(L"styleID");
-		if (!widgetKey.length() || widgetKey == L"0" || (decStrVal(widgetKey.c_str()) > 256) || (decStrVal(widgetKey.c_str()) < 0))
+		if (widgetKey.empty() || widgetKey == L"0" || (decStrVal(widgetKey.c_str()) > 256) || (decStrVal(widgetKey.c_str()) < 0))
 			widgetKey = widgetFromModel->Attribute(L"name");
-		if (!widgetKey.length())
+		if (widgetKey.empty())
 			continue;
 
 		// see if WidgetStyle already exists in UserStyles