Skip to content

Buffer.fill as node version 0.12.x #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LinusU wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Buffer.fill as node version 0.12.x #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/colony/lua_tm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,24 +672,32 @@ static int l_tm_buffer_write_double (lua_State *L)
static int l_tm_buffer_fill (lua_State *L)
{
uint8_t *a = (uint8_t *) lua_touserdata(L, 1);
int start = (int) lua_tonumber(L, 3);
int pos = (int) lua_tonumber(L, 3);
int end = (int) lua_tonumber(L, 4);

if (lua_isnumber(L, 2)) {
uint8_t value = (uint8_t) lua_tonumber(L, 2);
memset(a + start, value, end - start);
memset(a + pos, value, end - pos);
return 0;
}

int len = (int) lua_objlen(L, 2);

if (len == 0) {
memset(a + start, 0, end - start);
memset(a + pos, 0, end - pos);
return 0;
}

const char *source = lua_tostring(L, 2);
memset(a + start, source[0], end - start);

while (pos < end - len) {
memcpy(a + pos, source, len);
pos += len;
}

if (pos < end) {
memcpy(a + pos, source, end - pos);
}

return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions test/issues/issue-runtime-659.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ tap.eq('aaaa', b.toString(), 'buffer contains "aaaa"');

b = new Buffer(4);
b.fill('ab');
tap.eq('aaaa', b.toString(), 'buffer contains "aaaa"');
tap.eq('abab', b.toString(), 'buffer contains "abab"');

b = new Buffer(4);
b.fill('abc');
tap.eq('aaaa', b.toString(), 'buffer contains "aaaa"');
tap.eq('abca', b.toString(), 'buffer contains "abca"');

b = new Buffer(10);
b.fill('abc');
tap.eq('aaaaaaaaaa', b.toString(), 'buffer contains "aaaaaaaaaa"');
tap.eq('abcabcabca', b.toString(), 'buffer contains "abcabcabca"');

b = new Buffer([0x10, 0x20, 0x30, 0x40]);
b.fill('');
Expand Down