From 495e60d6415d6de63c9ef0f604a959d969118116 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 19 Jul 2021 18:57:57 -0700 Subject: std.ArrayList: add missing assertion in appendSliceAssumeCapacity --- lib/std/array_list.zig | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'lib/std/array_list.zig') diff --git a/lib/std/array_list.zig b/lib/std/array_list.zig index f55ef81a6b..8b46ec2145 100644 --- a/lib/std/array_list.zig +++ b/lib/std/array_list.zig @@ -227,10 +227,11 @@ pub fn ArrayListAligned(comptime T: type, comptime alignment: ?u29) type { /// Append the slice of items to the list, asserting the capacity is already /// enough to store the new items. **Does not** invalidate pointers. pub fn appendSliceAssumeCapacity(self: *Self, items: []const T) void { - const oldlen = self.items.len; - const newlen = self.items.len + items.len; - self.items.len = newlen; - mem.copy(T, self.items[oldlen..], items); + const old_len = self.items.len; + const new_len = old_len + items.len; + assert(new_len <= self.capacity); + self.items.len = new_len; + mem.copy(T, self.items[old_len..], items); } pub usingnamespace if (T != u8) struct {} else struct { @@ -570,11 +571,11 @@ pub fn ArrayListAlignedUnmanaged(comptime T: type, comptime alignment: ?u29) typ /// Append the slice of items to the list, asserting the capacity is enough /// to store the new items. pub fn appendSliceAssumeCapacity(self: *Self, items: []const T) void { - const oldlen = self.items.len; - const newlen = self.items.len + items.len; - - self.items.len = newlen; - mem.copy(T, self.items[oldlen..], items); + const old_len = self.items.len; + const new_len = old_len + items.len; + assert(new_len <= self.capacity); + self.items.len = new_len; + mem.copy(T, self.items[old_len..], items); } /// Append a value to the list `n` times. -- cgit v1.2.3