mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Out of bounds negative array indices should raise

Browse Source
This commit is contained in:
Nicolas Williams
2014-08-09 19:04:34 -05:00
parent 2d1a75f550
commit 20ca21cb0d
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jv.c
View File

@ -230,13 +230,9 @@ static jv* jvp_array_read(jv a, int i) {
}
static jv* jvp_array_write(jv* a, int i) {
assert(i >= 0);
jvp_array* array = jvp_array_ptr(*a);
if (i < 0)
i = array->length + i;
if (i < 0)
i = 0;
int pos = i + jvp_array_offset(*a);
if (pos < array->alloc_length && jvp_refcnt_unshared(a->u.ptr)) {
// use existing array space
@ -325,6 +321,14 @@ jv jv_array_get(jv j, int idx) {
jv jv_array_set(jv j, int idx, jv val) {
assert(jv_get_kind(j) == JV_KIND_ARRAY);
if (idx < 0)
idx = jvp_array_length(j) + idx;
if (idx < 0) {
jv_free(j);
jv_free(val);
return jv_invalid_with_msg(jv_string("Out of bounds negative array index"));
}
// copy/free of val,j coalesced
jv* slot = jvp_array_write(&j, idx);
jv_free(*slot);

8
tests/all.test
View File

@ -156,13 +156,13 @@ null
# Negative array indices
#
.foo[-1] = 0
try (.foo[-1] = 0) catch .
null
{"foo":[0]}
"Out of bounds negative array index"
.foo[-2] = 0
try (.foo[-2] = 0) catch .
null
{"foo":[0]}
"Out of bounds negative array index"
.[-1] = 5
[0,1,2]