aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-03-05 00:16:41 +0100
committerKim Alvefur <zash@zash.se>2019-03-05 00:16:41 +0100
commitf456f0c03e519a3e53caaf233f7c9f1a54e2ade8 (patch)
tree14fcea1707d3f42d1683bbecee2fe4b9983a0320
parentb772308c93a1c78995a073964ebf963f759ef81c (diff)
downloadprosody-f456f0c03e519a3e53caaf233f7c9f1a54e2ade8.tar.gz
prosody-f456f0c03e519a3e53caaf233f7c9f1a54e2ade8.zip
mod_storage_memory: Return error if 'before' or 'after' are not found (partial fix for #1325)
-rw-r--r--plugins/mod_storage_memory.lua10
1 files changed, 10 insertions, 0 deletions
diff --git a/plugins/mod_storage_memory.lua b/plugins/mod_storage_memory.lua
index 4655cb3a..2fae8828 100644
--- a/plugins/mod_storage_memory.lua
+++ b/plugins/mod_storage_memory.lua
@@ -127,20 +127,30 @@ function archive_store:find(username, query)
if query.reverse then
items:reverse();
if query.before then
+ local found = false;
for j = 1, #items do
if (items[j].key or tostring(j)) == query.before then
+ found = true;
i = j;
break;
end
end
+ if not found then
+ return nil, "item-not-found";
+ end
end
elseif query.after then
+ local found = false;
for j = 1, #items do
if (items[j].key or tostring(j)) == query.after then
+ found = true;
i = j;
break;
end
end
+ if not found then
+ return nil, "item-not-found";
+ end
end
if query.limit and #items - i > query.limit then
items[i+query.limit+1] = nil;