aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-10-28 14:32:33 +0000
committerMatthew Wild <mwild1@gmail.com>2020-10-28 14:32:33 +0000
commit9cb2fdc461083bd6cbcdf9cf3eb7f10dddfe58be (patch)
tree89bd3f80a9a83f437e44e94a53b289465a808b75 /util
parent7af694f5104fcf0adf05b5bfebcb81d5b5e44009 (diff)
parent01c5bf5529a6cf493209dfc1a1c1d5be9a6feac8 (diff)
downloadprosody-9cb2fdc461083bd6cbcdf9cf3eb7f10dddfe58be.tar.gz
prosody-9cb2fdc461083bd6cbcdf9cf3eb7f10dddfe58be.zip
Merge 0.11->trunk
Diffstat (limited to 'util')
-rw-r--r--util/dbuffer.lua30
1 files changed, 26 insertions, 4 deletions
diff --git a/util/dbuffer.lua b/util/dbuffer.lua
index 9d58b306..640c1449 100644
--- a/util/dbuffer.lua
+++ b/util/dbuffer.lua
@@ -1,5 +1,6 @@
local queue = require "util.queue";
+local s_byte, s_sub = string.byte, string.sub;
local dbuffer_methods = {};
local dynamic_buffer_mt = { __index = dbuffer_methods };
@@ -101,7 +102,11 @@ function dbuffer_methods:discard(requested_bytes)
return true;
end
-function dbuffer_methods:sub(i, j)
+-- Normalize i, j into absolute offsets within the
+-- front chunk (accounting for front_consumed), and
+-- ensure there is enough data in the first chunk
+-- to cover any subsequent :sub() or :byte() operation
+function dbuffer_methods:_prep_sub(i, j)
if j == nil then
j = -1;
end
@@ -118,18 +123,35 @@ function dbuffer_methods:sub(i, j)
j = self._length;
end
if i > j then
- return "";
+ return nil;
end
self:collapse(j);
- return self.items:peek():sub(self.front_consumed+1):sub(i, j);
+ if self.front_consumed > 0 then
+ i = i + self.front_consumed;
+ j = j + self.front_consumed;
+ end
+
+ return i, j;
+end
+
+function dbuffer_methods:sub(i, j)
+ i, j = self:_prep_sub(i, j);
+ if not i then
+ return "";
+ end
+ return s_sub(self.items:peek(), i, j);
end
function dbuffer_methods:byte(i, j)
i = i or 1;
j = j or i;
- return string.byte(self:sub(i, j), 1, -1);
+ i, j = self:_prep_sub(i, j);
+ if not i then
+ return;
+ end
+ return s_byte(self.items:peek(), i, j);
end
function dbuffer_methods:length()