]> granicus.if.org Git - ejabberd/commitdiff
Fix escaping for sql part of mamsub from muc mam
authorPaweł Chmielowski <pchmielowski@process-one.net>
Tue, 30 Apr 2019 11:36:31 +0000 (13:36 +0200)
committerPaweł Chmielowski <pchmielowski@process-one.net>
Tue, 30 Apr 2019 11:36:31 +0000 (13:36 +0200)
src/mod_mam_sql.erl

index 386110817e9c8d81ae53bce6f71b45316ebb98ee..45603565900ff51e73395e13aa7ba0b7fed57a9c 100644 (file)
@@ -420,11 +420,11 @@ make_sql_query(User, LServer, MAMQuery, RSM, ExtraUsernames) ->
 
     {UserSel, UserWhere} = case ExtraUsernames of
                               Users when is_list(Users) ->
-                                  EscUsers = [<<"'", (Escape(U))/binary, "'">> || U <- [SUser | Users]],
+                                  EscUsers = [<<"'", (Escape(U))/binary, "'">> || U <- [User | Users]],
                                   {<<" username,">>,
                                    [<<" username in (">>, str:join(EscUsers, <<",">>), <<")">>]};
                               subscribers_table ->
-                                  SJid = jid:encode({User, LServer, <<>>}),
+                                  SJid = Escape(jid:encode({User, LServer, <<>>})),
                                   {<<" username,">>,
                                    [<<" (username = '">>, SUser, <<"'">>,
                                        <<" or username in (select concat(room, '@', host) ",