From 20f8196bec82cc7e7914ce58a68284bbbbd40d13 Mon Sep 17 00:00:00 2001
From: donho <donho@f5eea248-9336-0410-98b8-ebc06183d4e3>
Date: Sat, 15 Sep 2007 11:09:25 +0000
Subject: [PATCH] [BUG_FIX] Fix the crash problem while session.xml is
 corrupted.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@33 f5eea248-9336-0410-98b8-ebc06183d4e3
---
 PowerEditor/src/Parameters.cpp | 67 ++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index c0e762b0..dcda08c5 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -613,35 +613,41 @@ bool NppParameters::getSessionFromXmlTree(TiXmlDocument *pSessionDoc, Session *p
 	{
 		(*ptrSession)._actifIndex = index;
 	}
+
 	for (TiXmlNode *childNode = sessionRoot->FirstChildElement("File");
 		childNode ;
 		childNode = childNode->NextSibling("File") )
 	{
 		TiXmlNode *fnNode = childNode->FirstChild();
-		const char *fileName = fnNode->Value();
-		Position position;
-		(childNode->ToElement())->Attribute("firstVisibleLine", &position._firstVisibleLine);
-		(childNode->ToElement())->Attribute("xOffset", &position._xOffset);
-		(childNode->ToElement())->Attribute("startPos", &position._startPos);
-		(childNode->ToElement())->Attribute("endPos", &position._endPos);
-
-		sessionFileInfo sfi(fileName, position);
-
-		for (TiXmlNode *markNode = fnNode->NextSibling("Mark");
-			markNode ;
-			markNode = markNode->NextSibling("Mark") )
+		if (fnNode)
 		{
-			int lineNumber;
-			const char *lineNumberStr = (markNode->ToElement())->Attribute("line", &lineNumber);
-			if (lineNumberStr)
+			const char *fileName = fnNode->Value();
+
+			if (fileName)
 			{
-				sfi.marks.push_back(lineNumber);
-				//::MessageBox(NULL, "coucou", "", MB_OK);
+				Position position;
+				(childNode->ToElement())->Attribute("firstVisibleLine", &position._firstVisibleLine);
+				(childNode->ToElement())->Attribute("xOffset", &position._xOffset);
+				(childNode->ToElement())->Attribute("startPos", &position._startPos);
+				(childNode->ToElement())->Attribute("endPos", &position._endPos);
+
+				sessionFileInfo sfi(fileName, position);
+
+				for (TiXmlNode *markNode = fnNode->NextSibling("Mark");
+					markNode ;
+					markNode = markNode->NextSibling("Mark") )
+				{
+					int lineNumber;
+					const char *lineNumberStr = (markNode->ToElement())->Attribute("line", &lineNumber);
+					if (lineNumberStr)
+					{
+						sfi.marks.push_back(lineNumber);
+						//::MessageBox(NULL, "coucou", "", MB_OK);
+					}
+				}
+				(*ptrSession)._files.push_back(sfi);
 			}
 		}
-
-		if (fileName)
-			(*ptrSession)._files.push_back(sfi);
 	}
 	
 	return true;
@@ -763,9 +769,13 @@ void NppParameters::feedUserCmds(TiXmlNode *node)
 			TiXmlNode *aNode = childNode->FirstChild();
 			if (aNode)
 			{
-				uc._cmd = aNode->Value();
-				if (uc.isValid())
-					_userCommands.push_back(uc);
+				const char *cmdStr = aNode->Value();
+				if (cmdStr)
+				{
+					uc._cmd = cmdStr;
+					if (uc.isValid())
+						_userCommands.push_back(uc);
+				}
 			}
 		}
 	}
@@ -1207,8 +1217,11 @@ void NppParameters::feedUserKeywordList(TiXmlNode *node)
 		if (i != -1)
 		{
 			TiXmlNode *valueNode = childNode->FirstChild();
-			const char *kwl = (valueNode)?valueNode->Value():(strcmp(keywordsName, "Delimiters")?"":"000000");
-			strcpy(_userLangArray[_nbUserLang - 1]->_keywordLists[i], kwl);
+			if (valueNode)
+			{
+				const char *kwl = (valueNode)?valueNode->Value():(strcmp(keywordsName, "Delimiters")?"":"000000");
+				strcpy(_userLangArray[_nbUserLang - 1]->_keywordLists[i], kwl);
+			}
 		}
 	}
 }
@@ -1359,9 +1372,7 @@ void StyleArray::addStyler(int styleID, TiXmlNode *styleNode)
 		TiXmlNode *v = styleNode->FirstChild();
 		if (v)
 		{
-			//const char *keyWords = v->Value();
-			//if (keyWords)
-				_styleArray[_nbStyler]._keywords = new string(v->Value());
+			_styleArray[_nbStyler]._keywords = new string(v->Value());
 		}
 	}
 	_nbStyler++;