From 65e6dfb9ddadacc147fe460cfd9bd499a83db429 Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 11 Jan 2016 14:35:11 +0300
Subject: [PATCH] Do not fail on incorrect data coming from SQL (898)

---
 src/mod_mam.erl | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index 6dfff6058..f334152f7 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -756,25 +756,34 @@ select(LServer, #jid{luser = LUser} = JidRequestor,
 		   true ->
 			{Res, true}
 		end,
-	    {lists:map(
+	    {lists:flatmap(
 	       fun([TS, XML, PeerBin, Kind, Nick]) ->
-		       #xmlel{} = El = xml_stream:parse_element(XML),
-		       Now = usec_to_now(jlib:binary_to_integer(TS)),
-		       PeerJid = jid:tolower(jid:from_string(PeerBin)),
-		       T = case Kind of
-                               <<"">> -> chat;
-                               null -> chat;
-                               _ -> jlib:binary_to_atom(Kind)
-			   end,
-		       {TS, jlib:binary_to_integer(TS),
-			msg_to_el(#archive_msg{timestamp = Now,
-					       packet = El,
-					       type = T,
-					       nick = Nick,
-					       peer = PeerJid},
-				  MsgType,
-				  JidRequestor)}
-		    end, Res1), IsComplete, jlib:binary_to_integer(Count)};
+		       try
+			   #xmlel{} = El = xml_stream:parse_element(XML),
+			   Now = usec_to_now(jlib:binary_to_integer(TS)),
+			   PeerJid = jid:tolower(jid:from_string(PeerBin)),
+			   T = case Kind of
+				   <<"">> -> chat;
+				   null -> chat;
+				   _ -> jlib:binary_to_atom(Kind)
+			       end,
+			   [{TS, jlib:binary_to_integer(TS),
+			     msg_to_el(#archive_msg{timestamp = Now,
+						    packet = El,
+						    type = T,
+						    nick = Nick,
+						    peer = PeerJid},
+				       MsgType,
+				       JidRequestor)}]
+		       catch _:Err ->
+			       ?ERROR_MSG("failed to parse data from SQL: ~p. "
+					  "The data was: "
+					  "timestamp = ~s, xml = ~s, "
+					  "peer = ~s, kind = ~s, nick = ~s",
+					  [Err, TS, XML, PeerBin, Kind, Nick]),
+			       []
+		       end
+	       end, Res1), IsComplete, jlib:binary_to_integer(Count)};
 	_ ->
 	    {[], false, 0}
     end.