1 files changed, 25 insertions, 12 deletions
diff --git a/Swiften/Parser/ExpatParser.cpp b/Swiften/Parser/ExpatParser.cpp
index f3b5250..8b7bf82 100644
--- a/Swiften/Parser/ExpatParser.cpp
+++ b/Swiften/Parser/ExpatParser.cpp
@@ -9,12 +9,20 @@
 #include <iostream>
 #include <string>
+#include <expat.h>
+#include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/Base/String.h>
 #include <Swiften/Parser/XMLParserClient.h>
 
+#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
+
 namespace Swift {
 
 static const char NAMESPACE_SEPARATOR = '\x01';
 
+struct ExpatParser::Private {
+	XML_Parser parser_;
+};
+
 static void handleStartElement(void* parser, const XML_Char* name, const XML_Char** attributes) {
 	std::pair<std::string,std::string> nsTagPair = String::getSplittedAtFirst(name, NAMESPACE_SEPARATOR);
@@ -48,5 +56,6 @@ static void handleEndElement(void* parser, const XML_Char* name) {
 
 static void handleCharacterData(void* parser, const XML_Char* data, int len) {
-	static_cast<XMLParser*>(parser)->getClient()->handleCharacterData(std::string(data, len));
+	assert(len >= 0);
+	static_cast<XMLParser*>(parser)->getClient()->handleCharacterData(std::string(data, static_cast<size_t>(len)));
 }
 
@@ -55,28 +64,32 @@ static void handleXMLDeclaration(void*, const XML_Char*, const XML_Char*, int) {
 
 static void handleEntityDeclaration(void* parser, const XML_Char*, int, const XML_Char*, int, const XML_Char*, const XML_Char*, const XML_Char*, const XML_Char*) {
-	XML_StopParser(static_cast<ExpatParser*>(parser)->getParser(), static_cast<XML_Bool>(0));
+	static_cast<ExpatParser*>(parser)->stopParser();
 }
 
 
-ExpatParser::ExpatParser(XMLParserClient* client) : XMLParser(client) {
-	parser_ = XML_ParserCreateNS("UTF-8", NAMESPACE_SEPARATOR);
-	XML_SetUserData(parser_, this);
-	XML_SetElementHandler(parser_, handleStartElement, handleEndElement);
-	XML_SetCharacterDataHandler(parser_, handleCharacterData);
-	XML_SetXmlDeclHandler(parser_, handleXMLDeclaration);
-	XML_SetEntityDeclHandler(parser_, handleEntityDeclaration);
+ExpatParser::ExpatParser(XMLParserClient* client) : XMLParser(client), p(new Private()) {
+	p->parser_ = XML_ParserCreateNS("UTF-8", NAMESPACE_SEPARATOR);
+	XML_SetUserData(p->parser_, this);
+	XML_SetElementHandler(p->parser_, handleStartElement, handleEndElement);
+	XML_SetCharacterDataHandler(p->parser_, handleCharacterData);
+	XML_SetXmlDeclHandler(p->parser_, handleXMLDeclaration);
+	XML_SetEntityDeclHandler(p->parser_, handleEntityDeclaration);
 }
 
 ExpatParser::~ExpatParser() {
-	XML_ParserFree(parser_);
+	XML_ParserFree(p->parser_);
 }
 
 bool ExpatParser::parse(const std::string& data) {
-	bool success = XML_Parse(parser_, data.c_str(), data.size(), false) == XML_STATUS_OK;
+	bool success = XML_Parse(p->parser_, data.c_str(), boost::numeric_cast<int>(data.size()), false) == XML_STATUS_OK;
 	/*if (!success) {
-		std::cout << "ERROR: " << XML_ErrorString(XML_GetErrorCode(parser_)) << " while parsing " << data << std::endl;
+		std::cout << "ERROR: " << XML_ErrorString(XML_GetErrorCode(p->parser_)) << " while parsing " << data << std::endl;
 	}*/
 	return success;
 }
 
+void ExpatParser::stopParser() {
+	XML_StopParser(p->parser_, static_cast<XML_Bool>(0));
+}
+
 }