version 0.2.18

[fms.git] / src / freenet / introductionpuzzlexml.cpp

diff --git a/src/freenet/introductionpuzzlexml.cpp b/src/freenet/introductionpuzzlexml.cpp
index b701305..12cc8e3 100644 (file)
--- a/src/freenet/introductionpuzzlexml.cpp
+++ b/src/freenet/introductionpuzzlexml.cpp
@@ -22,7 +22,7 @@ std::string IntroductionPuzzleXML::GetXML()
 \r
        tid->LinkEndChild(XMLCreateTextElement("Type",m_type));\r
 \r
-       tid->LinkEndChild(XMLCreateTextElement("UUID",m_uuid));\r
+       tid->LinkEndChild(XMLCreateCDATAElement("UUID",m_uuid));\r
 \r
        tid->LinkEndChild(XMLCreateTextElement("MimeType",m_mimetype));\r
 \r
@@ -47,7 +47,6 @@ const bool IntroductionPuzzleXML::ParseXML(const std::string &xml)
 \r
        if(!td.Error())\r
        {\r
-               TiXmlElement *el;\r
                TiXmlText *txt;\r
                TiXmlHandle hnd(&td);\r
 \r
@@ -56,19 +55,19 @@ const bool IntroductionPuzzleXML::ParseXML(const std::string &xml)
                txt=hnd.FirstChild("IntroductionPuzzle").FirstChild("Type").FirstChild().ToText();\r
                if(txt)\r
                {\r
-                       m_type=txt->ValueStr();\r
+                       m_type=SanitizeSingleString(txt->ValueStr());\r
                }\r
 \r
                txt=hnd.FirstChild("IntroductionPuzzle").FirstChild("UUID").FirstChild().ToText();\r
                if(txt)\r
                {\r
-                       m_uuid=txt->ValueStr();\r
+                       m_uuid=SanitizeSingleString(txt->ValueStr());\r
                }\r
 \r
                txt=hnd.FirstChild("IntroductionPuzzle").FirstChild("MimeType").FirstChild().ToText();\r
                if(txt)\r
                {\r
-                       m_mimetype=txt->ValueStr();\r
+                       m_mimetype=SanitizeSingleString(txt->ValueStr());\r
                }\r
 \r
                txt=hnd.FirstChild("IntroductionPuzzle").FirstChild("PuzzleData").FirstChild().ToText();\r