mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.ringbuffer: Ensure unsigned chars are always returned from :byte()

Browse source
This commit is contained in:
Matthew Wild 2020-06-24 12:34:20 +01:00
parent f7614d491a
commit b9a670dace
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spec/util_ringbuffer_spec.lua
View file

@ -92,5 +92,12 @@ describe("util.ringbuffer", function ()
end end
end end
end); end);
it("works with characters > 127", function ()
local b = rb.new();
b:write(string.char(0, 140));
local r = { b:byte(1, 2) };
assert.same({ 0, 140 }, r);
end);
end); end);
end); end);

6
util-src/ringbuffer.c
View file

@ -262,15 +262,15 @@ static int rb_byte(lua_State *L) {
if(calc_splice_positions(b, start, end, &wrapped_start, &wrapped_end)) { if(calc_splice_positions(b, start, end, &wrapped_start, &wrapped_end)) {
if(wrapped_end <= wrapped_start) { if(wrapped_end <= wrapped_start) {
for(i = wrapped_start; i < (long)b->alen; i++) { for(i = wrapped_start; i < (long)b->alen; i++) {
lua_pushinteger(L, b->buffer[i]); lua_pushinteger(L, (unsigned char)b->buffer[i]);
} }
for(i = 0; i < wrapped_end; i++) { for(i = 0; i < wrapped_end; i++) {
lua_pushinteger(L, b->buffer[i]); lua_pushinteger(L, (unsigned char)b->buffer[i]);
} }
return wrapped_end + (b->alen - wrapped_start); return wrapped_end + (b->alen - wrapped_start);
} else { } else {
for(i = wrapped_start; i < wrapped_end; i++) { for(i = wrapped_start; i < wrapped_end; i++) {
lua_pushinteger(L, b->buffer[i]); lua_pushinteger(L, (unsigned char)b->buffer[i]);
} }
return wrapped_end - wrapped_start; return wrapped_end - wrapped_start;
} }