From: Badlop <badlop@process-one.net>
Date: Fri, 27 Feb 2009 15:57:35 +0000 (+0000)
Subject: Merge fix from trunk r1190
X-Git-Tag: v2.0.5~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8be6b8df76e78b0b6ba11a3a91f8efc4f063a78a;p=ejabberd

Merge fix from trunk r1190

* src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted
strings (EJAB-304)

SVN Revision: 1927
---

diff --git a/ChangeLog b/ChangeLog
index e7a88a343..f2648c46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-27  Badlop  <badlop@process-one.net>
 
+	* src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted
+	strings (EJAB-304)
+
 	* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
 	and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
 
diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl
index 1e40e1437..0d27dbb68 100644
--- a/src/cyrsasl_digest.erl
+++ b/src/cyrsasl_digest.erl
@@ -101,15 +101,17 @@ parse1([], [], T) ->
 parse1([], _S, _T) ->
     bad.
 
-parse2([$" | Cs], Key, Val, Ts) ->
+parse2([$\" | Cs], Key, Val, Ts) ->
     parse3(Cs, Key, Val, Ts);
 parse2([C | Cs], Key, Val, Ts) ->
     parse4(Cs, Key, [C | Val], Ts);
 parse2([], _, _, _) ->
     bad.
 
-parse3([$" | Cs], Key, Val, Ts) ->
+parse3([$\" | Cs], Key, Val, Ts) ->
     parse4(Cs, Key, Val, Ts);
+parse3([$\\, C | Cs], Key, Val, Ts) ->
+    parse3(Cs, Key, [C | Val], Ts);
 parse3([C | Cs], Key, Val, Ts) ->
     parse3(Cs, Key, [C | Val], Ts);
 parse3([], _, _, _) ->