mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

builtin: make array.ensure_cap/1 more robust

Browse Source
This commit is contained in:
Delyan Angelov
2020-12-19 21:35:53 +02:00
parent d782db8878
commit cd30dcc287
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/builtin/array.v
View File

@@ -91,15 +91,18 @@ fn (mut a array) ensure_cap(required int) {
if required <= a.cap { if required <= a.cap {
return return
} }
mut cap := if a.cap == 0 { 2 } else { a.cap * 2 } mut cap := if a.cap > 0 { a.cap } else { 2 }
for required > cap { for required > cap {
cap *= 2 cap *= 2
} }
if a.cap == 0 { new_size := cap * a.element_size
a.data = vcalloc(cap * a.element_size) mut new_data := byteptr(0)
if a.cap > 0 {
new_data = v_realloc(a.data, new_size)
} else { } else {
a.data = v_realloc(a.data, cap * a.element_size) new_data = vcalloc(new_size)
} }
a.data = new_data
a.cap = cap a.cap = cap
} }