diff --git a/vlib/builtin/array.v b/vlib/builtin/array.v index 4766e192229d89..0770aae9f2622d 100644 --- a/vlib/builtin/array.v +++ b/vlib/builtin/array.v @@ -30,6 +30,7 @@ pub enum ArrayFlags { // Internal function, used by V (`nums := []int`) fn __new_array(mylen int, cap int, elm_size int) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } arr := array{ element_size: elm_size @@ -41,6 +42,7 @@ fn __new_array(mylen int, cap int, elm_size int) array { } fn __new_array_with_default(mylen int, cap int, elm_size int, val voidptr) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } mut arr := array{ element_size: elm_size @@ -79,6 +81,7 @@ fn __new_array_with_default(mylen int, cap int, elm_size int, val voidptr) array } fn __new_array_with_multi_default(mylen int, cap int, elm_size int, val voidptr) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } mut arr := array{ element_size: elm_size @@ -106,6 +109,7 @@ fn __new_array_with_multi_default(mylen int, cap int, elm_size int, val voidptr) } fn __new_array_with_array_default(mylen int, cap int, elm_size int, val array, depth int) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } mut arr := array{ element_size: elm_size @@ -127,6 +131,7 @@ fn __new_array_with_array_default(mylen int, cap int, elm_size int, val array, d } fn __new_array_with_map_default(mylen int, cap int, elm_size int, val map) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } mut arr := array{ element_size: elm_size @@ -149,6 +154,7 @@ fn __new_array_with_map_default(mylen int, cap int, elm_size int, val map) array // Private function, used by V (`nums := [1, 2, 3]`) fn new_array_from_c_array(len int, cap int, elm_size int, c_array voidptr) array { + panic_on_negative_len(len) cap_ := if cap < len { len } else { cap } arr := array{ element_size: elm_size @@ -163,6 +169,7 @@ fn new_array_from_c_array(len int, cap int, elm_size int, c_array voidptr) array // Private function, used by V (`nums := [1, 2, 3] !`) fn new_array_from_c_array_no_alloc(len int, cap int, elm_size int, c_array voidptr) array { + panic_on_negative_len(len) arr := array{ element_size: elm_size data: c_array @@ -1035,3 +1042,10 @@ pub fn (data voidptr) vbytes(len int) []u8 { pub fn (data &u8) vbytes(len int) []u8 { return unsafe { voidptr(data).vbytes(len) } } + +@[if !no_bounds_checking ?; inline] +fn panic_on_negative_len(len int) { + if len < 0 { + panic('negative .len') + } +} diff --git a/vlib/builtin/array_d_gcboehm_opt.v b/vlib/builtin/array_d_gcboehm_opt.v index d5a4a0c22ad68c..dffa424f64eb70 100644 --- a/vlib/builtin/array_d_gcboehm_opt.v +++ b/vlib/builtin/array_d_gcboehm_opt.v @@ -6,6 +6,7 @@ module builtin fn __new_array_noscan(mylen int, cap int, elm_size int) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } arr := array{ element_size: elm_size @@ -17,6 +18,7 @@ fn __new_array_noscan(mylen int, cap int, elm_size int) array { } fn __new_array_with_default_noscan(mylen int, cap int, elm_size int, val voidptr) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } mut arr := array{ element_size: elm_size @@ -43,6 +45,7 @@ fn __new_array_with_default_noscan(mylen int, cap int, elm_size int, val voidptr } fn __new_array_with_multi_default_noscan(mylen int, cap int, elm_size int, val voidptr) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } mut arr := array{ element_size: elm_size @@ -59,6 +62,7 @@ fn __new_array_with_multi_default_noscan(mylen int, cap int, elm_size int, val v } fn __new_array_with_array_default_noscan(mylen int, cap int, elm_size int, val array) array { + panic_on_negative_len(mylen) cap_ := if cap < mylen { mylen } else { cap } mut arr := array{ element_size: elm_size @@ -75,6 +79,7 @@ fn __new_array_with_array_default_noscan(mylen int, cap int, elm_size int, val a // Private function, used by V (`nums := [1, 2, 3]`) fn new_array_from_c_array_noscan(len int, cap int, elm_size int, c_array voidptr) array { + panic_on_negative_len(len) cap_ := if cap < len { len } else { cap } arr := array{ element_size: elm_size