mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the configured encoding value when decoding received messages

Browse Source
This commit is contained in:
Florent Le Coz
2016-01-04 13:47:26 +01:00
parent b0c3aa0be9
commit 79cdf170d2
5 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
louloulibs/xmpp/xmpp_stanza.cpp
+8 -8
View File
@@ -84,6 +84,14 @@ std::string xml_unescape(const std::string& data)
return res;
}
std::string sanitize(const std::string& data, const std::string& encoding)
{
if (utils::is_valid_utf8(data.data()))
return xml_escape(utils::remove_invalid_xml_chars(data));
else
return xml_escape(utils::remove_invalid_xml_chars(utils::convert_to_utf8(data, encoding.data())));
}
XmlNode::XmlNode(const std::string& name, XmlNode* parent):
parent(parent)
{
@@ -259,14 +267,6 @@ std::string& XmlNode::operator[](const std::string& name)
return this->attributes[name];
}
std::string sanitize(const std::string& data)
{
if (utils::is_valid_utf8(data.data()))
return xml_escape(utils::remove_invalid_xml_chars(data));
else
return xml_escape(utils::remove_invalid_xml_chars(utils::convert_to_utf8(data, "ISO-8859-1")));
}
std::ostream& operator<<(std::ostream& os, const XmlNode& node)
{
return os << node.to_string();
louloulibs/xmpp/xmpp_stanza.hpp
+1 -1
View File
@@ -8,7 +8,7 @@
std::string xml_escape(const std::string& data);
std::string xml_unescape(const std::string& data);
std::string sanitize(const std::string& data);
std::string sanitize(const std::string& data, const std::string& encoding = "ISO-8859-1");
/**
* Represent an XML node. It has