mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-25 17:57:17 +00:00
Code Issues 1 Releases Wiki Activity

Address #234 in array.c

Browse Source
This commit is contained in:
Calvin Rose 2020-01-02 20:27:38 -06:00
parent ef02dacdb4
commit a2c45a697b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/array.c
View File

@ -93,6 +93,9 @@ void janet_array_setcount(JanetArray *array, int32_t count) {
/* Push a value to the top of the array */ /* Push a value to the top of the array */
void janet_array_push(JanetArray *array, Janet x) { void janet_array_push(JanetArray *array, Janet x) {
if (array->count == INT32_MAX) {
janet_panic("array overflow");
}
int32_t newcount = array->count + 1; int32_t newcount = array->count + 1;
janet_array_ensure(array, newcount, 2); janet_array_ensure(array, newcount, 2);
array->data[array->count] = x; array->data[array->count] = x;
@ -225,6 +228,9 @@ static Janet cfun_array_insert(int32_t argc, Janet *argv) {
janet_panicf("insertion index %d out of range [0,%d]", at, array->count); janet_panicf("insertion index %d out of range [0,%d]", at, array->count);
chunksize = (argc - 2) * sizeof(Janet); chunksize = (argc - 2) * sizeof(Janet);
restsize = (array->count - at) * sizeof(Janet); restsize = (array->count - at) * sizeof(Janet);
if (INT32_MAX - (argc - 2) < array->count) {
janet_panic("array overflow");
}
janet_array_ensure(array, array->count + argc - 2, 2); janet_array_ensure(array, array->count + argc - 2, 2);
memmove(array->data + at + argc - 2, memmove(array->data + at + argc - 2,
array->data + at, array->data + at,