Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-08-31 09:55:27 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2013-08-31 09:55:27 (GMT) |
| commit | 41bb9db24566f15d60d2522eaea6f00cbaabdf4a (patch) | |
| tree | bf2c6518bc9a5ee1d37f3283af7589385fb7dd2f /Swiften/StringCodecs/Base64.cpp | |
| parent | 2f8ef07f7ac166ee073510fa7fca3c2b353cb9c2 (diff) | |
| download | swift-41bb9db24566f15d60d2522eaea6f00cbaabdf4a.zip swift-41bb9db24566f15d60d2522eaea6f00cbaabdf4a.tar.bz2 | |
Move newline handling for Base64 to VCard parser. IBB's Base64 won't have newlines.
Change-Id: I700949ea572421972b53539b83c4d04ff4d368f0
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swiften/StringCodecs/Base64.cpp')
| -rw-r--r-- | Swiften/StringCodecs/Base64.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Swiften/StringCodecs/Base64.cpp b/Swiften/StringCodecs/Base64.cpp index ec6f960..e1d70a0 100644 --- a/Swiften/StringCodecs/Base64.cpp +++ b/Swiften/StringCodecs/Base64.cpp @@ -70,11 +70,8 @@ SafeByteArray Base64::encode(const SafeByteArray& s) { return encodeDetail<SafeByteArray>(s); } -ByteArray Base64::decode(const std::string& input1) { +ByteArray Base64::decode(const std::string& input) { ByteArray result; - std::string input(input1); - input.erase(std::remove(input.begin(), input.end(), '\n'), input.end()); - input.erase(std::remove(input.begin(), input.end(), '\r'), input.end()); if (input.size() % 4) { return ByteArray(); |