Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-01 21:12:49 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-01 21:14:01 (GMT) |
| commit | 8189054fca9c68194ffc328eb7beecf241bbbcd7 (patch) | |
| tree | 4751ada9d52a529b62c8e911c61ba6306744cd94 /Swiften/Parser/LibXMLParser.cpp | |
| parent | 1bea8e06b44d1d71d2c3d461b7a98f28835d64bf (diff) | |
| parent | 9928be64a4c19f497302963d23ed0efc66b899c0 (diff) | |
| download | swift-8189054fca9c68194ffc328eb7beecf241bbbcd7.zip swift-8189054fca9c68194ffc328eb7beecf241bbbcd7.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Added fix for a billion laughs attack on Expat.
Conflicts:
Swiften/Parser/LibXMLParser.cpp
Swiften/Parser/UnitTest/XMLParserTest.cpp
Diffstat (limited to 'Swiften/Parser/LibXMLParser.cpp')
| -rw-r--r-- | Swiften/Parser/LibXMLParser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Parser/LibXMLParser.cpp b/Swiften/Parser/LibXMLParser.cpp index 9a2260b..ae87f38 100644 --- a/Swiften/Parser/LibXMLParser.cpp +++ b/Swiften/Parser/LibXMLParser.cpp @@ -15,7 +15,7 @@ namespace Swift { -static void handleStartElement(void *client, const xmlChar* name, const xmlChar*, const xmlChar* xmlns, int, const xmlChar**, int nbAttributes, int nbDefaulted, const xmlChar ** attributes) { +static void handleStartElement(void* parser, const xmlChar* name, const xmlChar*, const xmlChar* xmlns, int, const xmlChar**, int nbAttributes, int nbDefaulted, const xmlChar ** attributes) { AttributeMap attributeValues; if (nbDefaulted != 0) { // Just because i don't understand what this means yet :-) @@ -28,15 +28,15 @@ static void handleStartElement(void *client, const xmlChar* name, const xmlChar* } attributeValues.addAttribute(std::string(reinterpret_cast<const char*>(attributes[i])), attributeNS, std::string(reinterpret_cast<const char*>(attributes[i+3]), attributes[i+4]-attributes[i+3])); } - static_cast<XMLParserClient*>(client)->handleStartElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string()), attributeValues); + static_cast<XMLParser*>(parser)->getClient()->handleStartElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string()), attributeValues); } -static void handleEndElement(void *client, const xmlChar* name, const xmlChar*, const xmlChar* xmlns) { - static_cast<XMLParserClient*>(client)->handleEndElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string())); +static void handleEndElement(void *parser, const xmlChar* name, const xmlChar*, const xmlChar* xmlns) { + static_cast<XMLParser*>(parser)->getClient()->handleEndElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string())); } -static void handleCharacterData(void* client, const xmlChar* data, int len) { - static_cast<XMLParserClient*>(client)->handleCharacterData(std::string(reinterpret_cast<const char*>(data), len)); +static void handleCharacterData(void* parser, const xmlChar* data, int len) { + static_cast<XMLParser*>(parser)->getClient()->handleCharacterData(std::string(reinterpret_cast<const char*>(data), len)); } static void handleError(void*, const char* /*m*/, ... ) { @@ -62,7 +62,7 @@ LibXMLParser::LibXMLParser(XMLParserClient* client) : XMLParser(client) { handler_.warning = &handleWarning; handler_.error = &handleError; - context_ = xmlCreatePushParserCtxt(&handler_, client, 0, 0, 0); + context_ = xmlCreatePushParserCtxt(&handler_, this, 0, 0, 0); assert(context_); } |