From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Tue, 19 Jul 2016 19:23:30 +0000 (+0200)
Subject: mod_mam: Fix handling of result set page limit
X-Git-Tag: 16.08~36^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f8c499cfa78075b8edb41ac3683ce47b54f5f22;p=ejabberd

mod_mam: Fix handling of result set page limit

Restore function clause for handling a client-specified result set page
limit that doesn't exceed mod_mam's upper threshold.
---

diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index f5dc67abc..7e1460695 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -1037,7 +1037,9 @@ limit_max(none, _NS) ->
 limit_max(#rsm_in{max = Max} = RSM, _NS) when not is_integer(Max) ->
     RSM#rsm_in{max = ?DEF_PAGE_SIZE};
 limit_max(#rsm_in{max = Max} = RSM, _NS) when Max > ?MAX_PAGE_SIZE ->
-    RSM#rsm_in{max = ?MAX_PAGE_SIZE}.
+    RSM#rsm_in{max = ?MAX_PAGE_SIZE};
+limit_max(RSM, _NS) ->
+    RSM.
 
 match_interval(Now, Start, End) ->
     (Now >= Start) and (Now =< End).