summaryrefslogtreecommitdiff
path: root/src/jlib.erl
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-10-25 02:05:02 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-10-25 02:05:02 +0200
commit2399aba67d2e50318f7f7cbd22af04dc2b9eadea (patch)
tree2cf49e7d2adc45c66a62678f8d8f2bc85d36c0e5 /src/jlib.erl
parentMerge pull request #325 from weiss/auth-after-tls (diff)
Accept trailing whitespace in Base64 strings
Diffstat (limited to '')
-rw-r--r--src/jlib.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/jlib.erl b/src/jlib.erl
index 7735d7db..be1da3fd 100644
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@ -798,7 +798,12 @@ base64_to_term(Base64) ->
-spec decode_base64(binary()) -> binary().
decode_base64(S) ->
- decode_base64_bin(S, <<>>).
+ case catch binary:last(S) of
+ C when C == $\n; C == $\s ->
+ decode_base64(binary:part(S, 0, byte_size(S) - 1));
+ _ ->
+ decode_base64_bin(S, <<>>)
+ end.
take_without_spaces(Bin, Count) ->
take_without_spaces(Bin, Count, <<>>).