mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-11-26 12:14:49 +00:00
Code Issues 1 Releases Wiki Activity

Address #301

Browse Source 
Incorrect bounds checking and offset calculation in buffer/blit.
This commit is contained in:
Calvin Rose
2020-03-08 20:43:06 -05:00
parent 3d3d314fb7
commit a3d4ecddba
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/buffer.c
View File

@@ -334,13 +334,15 @@ static Janet cfun_buffer_blit(int32_t argc, Janet *argv) {
} else {
length_src = src.len - offset_src;
}
int64_t last = ((int64_t) offset_dest - offset_src) + length_src;
int64_t last = (int64_t) offset_dest + length_src;
if (last > INT32_MAX)
janet_panic("buffer blit out of range");
janet_buffer_ensure(dest, (int32_t) last, 2);
if (last > dest->count) dest->count = (int32_t) last;
int32_t last32 = (int32_t) last;
janet_buffer_ensure(dest, last32, 2);
if (last32 > dest->count) dest->count = last32;
if (length_src) {
if (same_buf) {
/* janet_buffer_ensure may have invalidated src */
src.bytes = dest->data;
memmove(dest->data + offset_dest, src.bytes + offset_src, length_src);
} else {
@@ -438,7 +440,7 @@ static const JanetReg buffer_cfuns[] = {
},
{
"buffer/blit", cfun_buffer_blit,
JDOC("(buffer/blit dest src & opt dest-start src-start src-end)\n\n"
JDOC("(buffer/blit dest src &opt dest-start src-start src-end)\n\n"
"Insert the contents of src into dest. Can optionally take indices that "
"indicate which part of src to copy into which part of dest. Indices can be "
"negative to index from the end of src or dest. Returns dest.")

2
src/mainclient/shell.c
View File

@@ -623,7 +623,7 @@ static int line() {
if (gbl_len == 0) { /* quit on empty line */
clearlines();
return -1;
}
}
kdelete(1);
break;
case 5: /* ctrl-e */